correcting user_controller merge and getting tests working