diff --git a/app/assets/stylesheets/questionnaire.css b/app/assets/stylesheets/questionnaire.css
index db74f00a..d191b1b0 100644
--- a/app/assets/stylesheets/questionnaire.css
+++ b/app/assets/stylesheets/questionnaire.css
@@ -127,12 +127,9 @@
 .o-question-group.view-grid tbody .odd .o-question-title, .o-question-group.view-grid tbody .odd td {
   background-color: #f6f6f6;
 }
-<<<<<<< HEAD
-=======
 .o-question-group.view-grid .o-question-title {
   font-size: 1em;
 }
->>>>>>> 19effe9... survey module: update css
 .o-question-group.view-grid tbody .odd .o-question-title {
   background-color: transparent;
 }