Merge Conflict replaced