fixed merge conflict in eyes_controller