diff --git a/docs/src/contribute.md b/docs/src/contribute.md
index 0ee42ce65..9560daa16 100644
--- a/docs/src/contribute.md
+++ b/docs/src/contribute.md
@@ -26,4 +26,18 @@ Then, after it is merged, do the following under our main repository:
 4. `make update` (This is to update the submodules to the latest version)
 5. `make publish-book`
 
+## Trouble Shooting
+
+If you see file conflicts in the pull request, this may due to that you have created your new branch from an old version of the `devel` branch. Update your new branch using the following commands:
+
+```
+git checkout devel
+git pull
+make update
+git checkout readme
+git merge devel
+# use something like `git mergetool` to resolve conflicts, then read the instructions for completing the merge (usually just a `git commit`)
+# check the output of `git diff devel`
+```
+
 Thank you so much for your help to the decentralized and open source community. :)