dewa

test file 2 now says
good bye
dewa
merged and resolved conflict with new-test-file-2

test file 2 now says
good bye
sayonara
dewa