del orig
add 2.txt
Update 2.txt
add line 22
Conflicts:	2.txt
Update 2.txt
add 22
Conflicts:
	2.txt
Merge branch 'work_2' into work_1