diff --git a/board/odroidc1/overlay/etc/os.conf b/board/odroidc1/overlay/etc/os.conf
index 859ab7c415..d3ce9dfd6c 100644
--- a/board/odroidc1/overlay/etc/os.conf
+++ b/board/odroidc1/overlay/etc/os.conf
@@ -6,10 +6,6 @@ os_wlan="wlan0"
 os_ppp="ppp0"
 os_networkless="false"
 os_firmware_method="github"
-<<<<<<< HEAD
 os_firmware_repo="ccrisan/motioneyeos"
-=======
-os_firmware_repo="ccrisan/thingos"
->>>>>>> thingos/master
 os_firmware_username=""
 os_firmware_password=""
diff --git a/board/odroidc2/overlay/etc/os.conf b/board/odroidc2/overlay/etc/os.conf
index 859ab7c415..d3ce9dfd6c 100644
--- a/board/odroidc2/overlay/etc/os.conf
+++ b/board/odroidc2/overlay/etc/os.conf
@@ -6,10 +6,6 @@ os_wlan="wlan0"
 os_ppp="ppp0"
 os_networkless="false"
 os_firmware_method="github"
-<<<<<<< HEAD
 os_firmware_repo="ccrisan/motioneyeos"
-=======
-os_firmware_repo="ccrisan/thingos"
->>>>>>> thingos/master
 os_firmware_username=""
 os_firmware_password=""