recovery from corrupt git
Merge conflicts after recovery