diff --git a/src/libs/routes/api.js b/src/libs/routes/api.js
index e774e090192dd6c122bf3f2c28ba5b155823d1f5..a629255bd7c72130059aab8fc49866f2882e07a2 100644
--- a/src/libs/routes/api.js
+++ b/src/libs/routes/api.js
@@ -60,11 +60,8 @@ const distributionFactor = require(`${libs}/routes/distributionFactor`);
 
 const siope = require(`${libs}/routes/siope`);
 
-<<<<<<< HEAD
 const outOfSchool = require(`${libs}/routes/outOfSchool`);
-=======
 const classroomCount = require(`${libs}/routes/classroomCount`);
->>>>>>> classroom_count
 
 api.get('/', (req, res) => {
     res.json({ msg: 'SimCAQ API is running' });