Merge Conflict Resolved