diff --git a/dump1090/interactive.c b/dump1090/interactive.c
index 7b6360f..cf4cb02 100644
--- a/dump1090/interactive.c
+++ b/dump1090/interactive.c
@@ -572,7 +572,6 @@ void interactiveShowData(void) {
                         printf("\n ");
                     }
 
-<<<<<<< HEAD
                     if ((now - a->seen) > 30 ) {
                         printf("\x1B[1;30m%-8s%5s %4s %5s  %c%c %d",
                             a->flight, 
@@ -590,16 +589,6 @@ void interactiveShowData(void) {
                             cLat, cLon,
                             (int)((float)signalAverage/25.0f));
                     }
-=======
-                    printf("\x1B[1;31m%-8s\x1B[1;32m%5s \x1B[1;33m%4s \x1B[1;34m%5s  \x1B[1;36m%c%c \x1B[1;35m%d",
-                        a->flight, 
-                        strFl, 
-                        strGs,
-                        strD, 
-                        cLat, cLon,
-                        (int)((float)signalAverage/25.0f));
-
->>>>>>> 474b6b928fbf41ebad522ee55fae952c481aabf5
 
                     if(d<5) {
                      printf("%ls",L"\x1B[1;37m│\n└──────────────────────────────┘");
diff --git a/dump1090/interactive.o b/dump1090/interactive.o
index 3eb74d5..6fdd68c 100644
Binary files a/dump1090/interactive.o and b/dump1090/interactive.o differ
diff --git a/dump1090/view1090.REMOVED.git-id b/dump1090/view1090.REMOVED.git-id
index 477777b..cd5a2a1 100644
--- a/dump1090/view1090.REMOVED.git-id
+++ b/dump1090/view1090.REMOVED.git-id
@@ -1 +1 @@
-f8df326f25fd1b7dcebda663d33f6c93ea268776
\ No newline at end of file
+18958032218e1a8e0ef5b79733e5e4b9dd540f61
\ No newline at end of file