test one
test two
two two
2

Conflicts:
	cewwwsww.txt
reset
new