commit master xx
another xx
Merge branch 'another3'