Fixed merge
edited routes