solve conflict in routes