controllers merge conflict fix