Smart Merge with Tilemaps

I am trying to merge a tilemap that has been modified in different branches.
Unfortunately, the Smart Merge tool doesn't really help with merging the changes.
Merging the changes manually is also really complicated, even for fairly easy conflicts,
because of the way the tilemap gets serialized.

Example conflict:

Code (CSharp):

1.  
2. <<<<<<< HEAD
3.   - first: {x: -7, y: 3, z: 0}
4. =======
5.   - first: {x: 7, y: -3, z: 0}
6. >>>>>>> dev-b
7.     second:
8.       serializedVersion: 2
9.       m_TileIndex: 0
10.       m_TileSpriteIndex: 0
11.       m_TileMatrixIndex: 0
12.       m_TileColorIndex: 0
13.       m_TileObjectToInstantiateIndex: 65535
14.       dummyAlignment: 0
15.       m_AllTileFlags: 1073741825
16. <<<<<<< HEAD
17.   - first: {x: -6, y: 3, z: 0}
18. =======
19.   - first: {x: 7, y: -2, z: 0}
20. >>>>>>> dev-b
21.     second:
22.       serializedVersion: 2
23.       m_TileIndex: 0
24.       m_TileSpriteIndex: 0
25.       m_TileMatrixIndex: 0
26.       m_TileColorIndex: 0
27.       m_TileObjectToInstantiateIndex: 65535
28.       dummyAlignment: 0
29.       m_AllTileFlags: 1073741825
30.  

Are there any tricks I can use to merge the conflict or does anyone have advice for a workflow that won't lead to this situation?