Clean up after conflict