simulataneuous test 2 - mergetool
lines merged