diff --git a/src/monero_init.c b/src/monero_init.c
index 5e5952e..82c4e5d 100644
--- a/src/monero_init.c
+++ b/src/monero_init.c
@@ -61,44 +61,6 @@ void monero_init() {
   G_monero_vstate.state = STATE_IDLE;
 }
 
-<<<<<<< HEAD
-#define MONERO_SUPPORTED_CLIENT_SIZE 5
-const char * const monero_supported_client[MONERO_SUPPORTED_CLIENT_SIZE] = {
-  "3.0.0", "3.0.1", "3.0.2", "3.0.3", "3.1.0"
-};
-
-int monero_apdu_reset() {
-
-  unsigned int client_version_len;
-  char client_version[10];
-  client_version_len = G_monero_vstate.io_length - G_monero_vstate.io_offset;
-  if (client_version_len > 10) {
-    THROW(SW_CLIENT_NOT_SUPPORTED+1);
-  }
-  monero_io_fetch(client_version, client_version_len);
-
-  unsigned int i = 0;
-  while(i < MONERO_SUPPORTED_CLIENT_SIZE) {
-    if ((strlen(PIC(monero_supported_client[i])) == client_version_len) &&
-        (os_memcmp(PIC(monero_supported_client[i]), client_version, client_version_len)==0) ) {
-      break;
-    }
-    i++;
-  }
-  if (i == MONERO_SUPPORTED_CLIENT_SIZE) {
-    THROW(SW_CLIENT_NOT_SUPPORTED);
-  }
-
-  monero_io_discard(0);
-  monero_init();
-  monero_io_insert_u8(MONERO_VERSION_MAJOR);
-  monero_io_insert_u8(MONERO_VERSION_MINOR);
-  monero_io_insert_u8(MONERO_VERSION_MICRO);
-  return 0x9000;
-}
-=======
->>>>>>> dev
-
 /* ----------------------------------------------------------------------- */
 /* --- init private keys                                               --- */
 /* ----------------------------------------------------------------------- */