diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index 363919fb5a335cb57365ba467d082eda82b33633..b9f62c266201792bc21d830aaaf3db320307be27 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -16,10 +16,6 @@
                 label-languages=''
                 naked
             )
-<<<<<<< HEAD
-=======
-
->>>>>>> language selector works.
             .dropdownWrapper
                 sib-display#mentor-account-picture.dropdownLabel(
                     bind-user