Solve merging conflicts