Resolved branch conflict in Controller