1099-R includes rollover and form 5498 includes QCD

My 2020 form 1099-R is accompanied by two 5498 Forms.  One 5498 covers my Roth conversion and Qualified Charitable Distributions (QCD).  I know how to enter this.  The second 5498 includes both required minimum distributions that were reversed, i.e. rolled over before August 2020 and a QCD, hence the problem.  How do I fill out the 1099-R for the rollover that accurately reflects the amount rolled over and the QCD that is incorrectly included.  If I use the full amount, it will all be reported as non-taxable.  That is the same result the I should achieve if I accurately report the amount actually rolled over and the QCD.  Do I just ignore the QCD and report the full amount as a rollover?