Revert closing on conflict