clean up after conflict