feature
feature commited
after checkout
Merge branch 'feature'
merged