Fix routes merge issue