diff --git a/ui.c b/ui.c
index 794ea39..156e360 100644
--- a/ui.c
+++ b/ui.c
@@ -50,13 +50,8 @@ static int gShowBackButton = 0;
 static pthread_mutex_t gUpdateMutex = PTHREAD_MUTEX_INITIALIZER;
 static gr_surface gBackgroundIcon[NUM_BACKGROUND_ICONS];
 static gr_surface gProgressBarIndeterminate[PROGRESSBAR_INDETERMINATE_STATES];
-<<<<<<< HEAD
 static gr_surface gProgressBarEmpty;
 static gr_surface gProgressBarFill;
-=======
-static gr_surface gProgressBarEmpty[NUM_SIDES];
-static gr_surface gProgressBarFill[NUM_SIDES];
->>>>>>> command line nandroid
 static int ui_has_initialized = 0;
 
 static const struct { gr_surface* surface; const char *name; } BITMAPS[] = {
@@ -604,4 +599,8 @@ void ui_set_showing_back_button(int showBackButton) {
 
 int ui_get_showing_back_button() {
     return gShowBackButton;
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> github/eclair