diff --git a/FAQ.md b/FAQ.md
new file mode 100644
index 0000000..fa6907b
--- /dev/null
+++ b/FAQ.md
@@ -0,0 +1,13 @@
+Welcome to the reaver-wps-fork-t6x 1.6b wiki!
+
+![](http://pix.toile-libre.org/upload/original/1498011423.png)
+
+**What to do if I cannot merge this repository when I do git pull?**  
+
+ In case you get merge errors when doing git pull, try the following steps  
+`git merge --abort`  
+`git fetch off` (where off is the name of the upstream repo)  
+`git branch -m master master-old_local` (rename your master branch to master-old_local)  
+`git checkout off/master`  
+`git checkout -b master`  
+... and you have current master