You could try https://mergiraf.org/

For me the answer to painful merge conflicts has been... Claude

That would also be trivial for a syntax-tree-based tool, right?

the resolution depends on a deeper understanding of the contents of the list and whether they are ordered according to some scheme (in which case you will need to look at the two lines and see which one goes first)