merging baked changes