Fix conflicts

src/libs/convert/admDependencyPriv.js

src/libs/convert/citySize.js

src/libs/convert/educationLevelMod.js

src/libs/convert/educationLevelShort.js

src/libs/convert/idhmLevel.js

src/libs/convert/incomeLevel.js

src/libs/convert/schoolYear.js

src/libs/middlewares/id2str.js

src/libs/routes/class.js

src/libs/routes/enrollment.js

src/libs/routes/idhm.js

src/libs/routes/school.js

src/libs/routes/teacher.js

src/libs/routes/user.js