Yaad nahi
Merge conflict
debugging user_controller.rb