add third line
add fourth line
conflict
five line
add merge
six line
seven line
merge my
my you conflict
merge test
modify a bug
add test
test conflict