If your excess contribution for 2018 was only $6,040, lines 23 and 24 of your 2018 Form 5329 should show $6,040 and line 18 of your 2019 Form 5329 should show only $6,040. Since you made a regular distribution of $6,500, line 20 of your 2019 Form 5329 will show $6,500, resulting in $0 on line 22.
