example for json output
merged conflicted files