diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index aa24c8ca2c..5d02cf9094 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -251,7 +251,6 @@ Menu::Menu() {
                                            qApp,
                                            SLOT(setFullscreen(bool)));
 #endif
-<<<<<<< HEAD
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, 
         0, // QML Qt::Key_P, 
         true, qApp, SLOT(cameraMenuChanged()));