testing merging
Merge commit 'dd86a7edadfaaffece6057878a0c576a5f93789e' into branch-test

Conflicts:
	branch.txt
minor correction of merge 1