Solving: Merge Conflict