Github resolve conflict

I think you would need to rebase this PR on top of master, which would also mean resolving all the conflicts.

git fetch --all --prune  
git checkout i18n-cn-basic-javascript  
git pull --rebase upstream master  

Carefully Proceed to fixing all the conflicts and then continue with:

git add .  
git rebase --continue  

Once there are no conflicts, you can:

git push --force origin i18n-cn-basic-javascript  

This can be avoided a little bit by making PRs with fewer files, the less the better.