Testing... master changes
Testing... master move
Merge branch 'master' into mergemove

Conflicts:
	another.txt
manual merge