Json v/s ndjson in Kibana

In our case the ndjson files are checked into git repository and deployed from there into Kibana.
But whenever we make changes to the Kibana dashboards -> we export the ndjson -> and manually handpick and then merge the changes back into the ndjson file to be checked in.
We find these last steps tedious. Is there a more efficient way to do it?

Is the problem that the merge conflict occurs on the same saved object? Or is it that the order of saved objects changes making it hard for git to keep track of which lines are matching?

It would be useful if you could give an example merge conflict.