test one
2

Conflicts:
	cewwwsww.txt
reset
new
new 2