changes that will conflict