minor spacing
resolved merge conflict in users_controller