diff --git a/src/main/java/generator/SeniorQuestionGenerator.java b/src/main/java/generator/SeniorQuestionGenerator.java
index 9963ecb..825edc1 100644
--- a/src/main/java/generator/SeniorQuestionGenerator.java
+++ b/src/main/java/generator/SeniorQuestionGenerator.java
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 package generator;
 
 import entity.Question;
@@ -226,9 +226,4 @@ public class SeniorQuestionGenerator implements QuestionGenerator {
         return result;
     }
 }
-=======
-package main.java.generator;
 
-public class SeniorQuestionGenerator {
-}
->>>>>>> 93d8b771666e4fb2ee7477c19dcf6f4fb1eec045