Fix incorrect conflict resolution

        return IVAS_ERR_OK;

    }

    IF ( !ivas_dec_split_rend_cldfb_in( st_ivas->renderer_type ) )

    {

#if 1 /* NOTE(sgi): Workaround for bit width mismatch */

        Word32 pcmBuf32[960 * 16];

        for (int i = 0; i < *nOutSamples * hIvasDec->st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses * BINAURAL_CHANNELS; ++i)

        {

            // NOTE(sgi2det): Is this even correct or do we need to adjust the Q-format?

            pcmBuf32[i] = pcmBuf[i];

        }

#endif

        // NOTE(sgi2det): We need signal in 32 bit here, but get only 16 bit from IVAS_DEC_GetSamplesRenderer...

        //                The float version of that function has switchable output format (int16 or float) but not in BASOP.

        //                Any ideas for a better solution than this pcmBuf32?

        // NOTE(det2sgi): Was the requirement for the TD_Ringbuf a 32 Bit Datatype? A 16 Bit would make more sense.

        ivas_TD_RINGBUF_PushInterleaved( st_ivas->hSplitBinRend->hMultiBinTdData, pcmBuf32, *nOutSamples );

    }

// NOTE: Here BASOP differs from float version. In float, we push samples to TD ring buffer here. In BASOP, TD signals are only available in 16 bit here.

// To save TD signals in 32-bit precision, samples are pushed via ivas_TD_RINGBUF_PushChannels in ivas_jbm_dec_render_fx within IVAS_DEC_GetSamplesRenderer.