undo merge
Merge branch 'tmp'