Cleaning up after conflict