Resolved conflict in routes