Both conflict strings are now on the same line