I'm using the repository at https://github.com/wikibook/learnxinyminutes-docs,
and there's no problem when I perform `git push` and `git pull`.

How do you think I should do for removing the conflict?