Merge and solve conflicts