Fix conflicts

src/libs/routes/api.js

src/libs/routes/idhme.js

src/libs/routes/pibpercapita.js

src/libs/routes/population.js

src/libs/routes/teacher.js

src/test/idhme.js