Adjust conflicts
Create migration for user name
Add user profile page in rails
Remove location from users form
remove duplicate lines of code