create conflict2
Merge remote-tracking branch 'origin/master'

Conflicts:
	my_libs/test.txt
conflict3
add new.txt
Merge branch 'master' of https://github.com/wsdwsd0829/libs

Conflicts:
	my_libs/test.txt