Simple working solution
Undo branch merge data