Git conflicts with JSON files Git conflicts with JSON files json json