Consolidate changes made before merge