Do not add a trailing newline when not necessary in 3 way merge