fixed conflict in controller