Fixed conflict between routes