Add a fallback to line-based merge if the merge fails

[slarse]

It needs to be possible to disable it from the command line.

Disabling it should also disable the all ready existing fallback when there are no types in the file.