test
Merge remote-tracking branch 'child/master' into test-merge-child
Merge commit 'd74e520f8f4d380a15a2a0eb0c5b969c7700d477' into test-merge-child
conflict text
Merge commit '3cb67a21d5cb3f7bc83235ddf2b8cd94d7f3cd2b' into test-merge-child

Conflicts:
	child/test2.txt