conflict in routes resolved