Very easy: merge everything, fix after the feature freeze. It’s a feature freeze, not a bugfix freeze. Edit: wait you said code freeze, my bad. Still, merge everything. If stuff doesn’t work after the freeze, management will unfreeze for fixes. Or they freeze a non-working product. Do stupid management, get stupid results. Not on me to make idiotic processes work.