feature 1
Merge branch 'feature2'
undo