Fix merge conflicts (controller).