add second line
Merge branch 'b1'

Conflicts:
	perl/new.txt
after merge, change back