Fixed remaining conflict in routes