Merging c.json changes