Correct merge conflict with Staffs controller show patient action
Remove hardcoded user name