commit that will conflict 1