Fix missing deletion method in usercontroller
Fix merge conflicts