diff --git a/recovery.c b/recovery.c
index ceb1136..7a6ba03 100644
--- a/recovery.c
+++ b/recovery.c
@@ -493,6 +493,7 @@ prompt_and_wait() {
                         return;  // reboot if logs aren't visible
                     } else {
                         ui_print("\nInstall from sdcard complete.\n");
+                    }
                 }
                 break;
             case ITEM_INSTALL_ZIP:
diff --git a/ui.c b/ui.c
index 156e360..df52c7e 100644
--- a/ui.c
+++ b/ui.c
@@ -599,8 +599,4 @@ void ui_set_showing_back_button(int showBackButton) {
 
 int ui_get_showing_back_button() {
     return gShowBackButton;
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> github/eclair