diff --git a/Makefile b/Makefile
index a0bb021..b3800a5 100755
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,8 @@ APP_LOAD_PARAMS += --path "45'"
 #APP_LOAD_PARAMS += --path "1517992542'/1101353413'"
 
 APPVERSION_M=1
-<<<<<<< HEAD
 APPVERSION_N=3
 APPVERSION_P=7
-=======
-APPVERSION_N=4
-APPVERSION_P=2
->>>>>>> f9ebc6d... Fix case sensitivity issue for silent mode + bump version 1.4.2
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 APP_LOAD_FLAGS= --appFlags 0x240 --dep Ethereum:$(APPVERSION)
 
diff --git a/src_features/signTx/cmd_signTx.c b/src_features/signTx/cmd_signTx.c
index d1e4898..990929a 100644
--- a/src_features/signTx/cmd_signTx.c
+++ b/src_features/signTx/cmd_signTx.c
@@ -72,10 +72,10 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer, uint16_t dataLength
       THROW(0x6A80);
   }
 
-  *flags |= IO_ASYNCH_REPLY;
-
   if (txResult == USTREAM_FINISHED) {
     finalizeParsing(false);
   }
+
+  *flags |= IO_ASYNCH_REPLY;
 }