I\'ve experienced a strange merge conflict on git-managed .json file and have no clue how this happened.
Situation in summary : I added a data json file A.json
