test
1
dev2
dev
Merge branch 'dev2'
master
dev
merge