Deleted wrong merge stuff on User controller and view.