merging over new format changes