Merge Conflict fix