Routes merge conflict fixed