Fix conflict in controller classes/controller.cs