Conflict cleanup after merge