add file1
modify file1 \nadd file2
modify file1
add file 3
test mo file2
test2 mo file2
test3 mo file2
mo file1
Merge branch 'master' into new

Conflicts:
	file1