Fixed merge conflicts
Added missing route due to merge conflict