[bob1029]

In theory it should merge well. The only actual newline is at the end of the physical line. Everything else is escaped in the JSON string.

[mirekrusin]

But auto merge would have to decide the order when resolving and it can't do it without custom merge.