Resolved Controller Merge Conflict