Fixed conflict in routes