Resolved Conflict in Controller