oops broke ManageController with merge