manual merge with dynamic_fix