Fix route conflict