Red Hat repository fails to sync (Pulp3Error)

I believe i just ran into this same error after upgrading from 3.16 to 3.17:

Katello::Errors::Pulp3Error: duplicate key value violates unique constraint "core_repositorycontent_repository_id_content_id_df902e11_uniq"
DETAIL:  Key (repository_id, content_id, version_removed_id)=(5cf832a8-c96a-4336-94f2-1617e2f6f3fa, 0b09dd09-de5e-45a4-9807-61961c29b685, 6f8416a0-8cc2-4a85-b458-5634cad2a6d9) already exists.

I reviewed the github commit and tried to manually apply fix, but got a pulp 503 error, so i rolled back my VM. These are the steps i had done:

Can you elaborate on what you mean by removing conflict by hand with pulpcore-manager? Wasnt sure how to use that command and im not getting fruitful results.