origin
1st line chgd
3rd line chgd
Merge branch 'b1'
cherry-picked origin

Conflicts:
	MergeConflict.txt
add new file
changes made
chg error
undo chg
add files
delete files