The way we store data is not the same as using that format to solve conflicts. Take a look at semanticmerge.com