Restore code from bad merge resolve