conflict cleanup