test1
Merge commit '6110f69f35e76fed7d501d66024674d0d5a396a5' into test-merge-child

Conflicts:
	child/test1.txt
test1
Merge remote-tracking branch 'origin/test2' into test-by-child