revert back to old state
merged files