Fixed merge conflict in users model
Remove require of users helpers since methods now in application helpers
Fix merge conflicts in routes file