diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh
index 051799f109..2444701815 100755
--- a/board/common/cleanups.sh
+++ b/board/common/cleanups.sh
@@ -191,10 +191,7 @@ rm -f $TARGET/etc/init.d/S20urandom
 rm -f $TARGET/etc/init.d/S80dhcp-relay
 rm -f $TARGET/etc/init.d/S80dhcp-server
 rm -f $TARGET/etc/init.d/S91smb
-<<<<<<< HEAD
 rm -f $TARGET/etc/init.d/S99motion
-=======
->>>>>>> thingos/master
 
 # other unwanted dirs
 rm -rf $TARGET/data/*
diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig
index b26e40cb86..06309d3c2d 100644
--- a/configs/odroidc1_defconfig
+++ b/configs/odroidc1_defconfig
@@ -26,6 +26,7 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/647316d8199babad4cd22309849842e035494f2b.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="odroidc"
+BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson8b_odroidc"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config"