How to sync a clone of this repo after changing the name and adding more code.

I have tried to add this repo as an upstream to my clone of it and merge the main branch, but after changing the name for the project and adding some code it's becoming hard to solve all the conflicts there.
Has anyone lived this pain?
Is there any way to make this possible without having too many conflicts?
Is there any other way to keep in sync?

Thanks.