Fix conflict

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' });