Conflict cleanup