diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index aeec2d952..164bbb93b 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -2118,8 +2118,4 @@ void ShellCorona::refreshCurrentShell()
 
 // Desktop corona handler
 
-#include "moc_shellcorona.cpp"
-<<<<<<< HEAD
 #include "shellcorona.moc"
-=======
->>>>>>> ea99f2217... Add shortcut to hide panel