I think you may need to try updating your fork and then push PR with new branches.

Although resolving conflict and then squash & merge would ignore the existing commits, it is still more formal to create bug fix base on branch master.

Thanks for your contribution anyway!

Try this:

git add remote opensourceaix https://github.com/OpenSourceAIX/ColinTreeListView.git
git fetch opensourceaix
git reset --soft opensourceaix/master
git commit -am "commit message"
git push -f

This may works

Thanks, it worked, but the first command was
git remote add opensourceaix https://github.com/OpenSourceAIX/ColinTreeListView.git

Hi there, just want to merge and suddenly found that your commit seems have some problem.
It rewrites the whole repository line by line, even the LICENSE is changed...
Could you try to fix that commit so that I can merge it safely?

I don't know what's wrong with my repo, I guess it would be best that you make the changes (it's only two lines) and I refork again.