Merge changes, including data as json files