correcting after conflict