Fixing another residual merge issue