myf bag
merging myfile
merging myf bag
myf 3
ok1
Merge branch 'master' into bag.

Conflicts:
	myfile