bnew
Merge branch 'master' of https://github.com/zexpp5/test.git
ma
nb
ma
Merge branch 'newB'

Conflicts:
	Â§©