diff --git a/server/routes/question.js b/server/routes/question.js
index 9151821..6783f05 100644
--- a/server/routes/question.js
+++ b/server/routes/question.js
@@ -3,10 +3,7 @@ const router = express.Router();
 
 const tokenAuth = require('server/middleware/tokenAuth');
 
-<<<<<<< HEAD
-=======
 const HandleBounty = require('./question/HandleBounty');
->>>>>>> bounties
 const CreateAnswer = require('./question/CreateAnswer');
 const CreateAnswerComment = require('./question/CreateAnswerComment');
 const CreateComment = require('./question/CreateComment');