test vimdiff
master branch
add one more line
add one more conflict
merge finished