revert: Save data for continuing after conflict resolution