Resolving line conflicts
merge User.show.erb