change a conflict