Corrected Merge Conflicts in branch defaulting to Production