diff --git a/README.md b/README.md
index 21649db..5b46da2 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ Only modern browsers are supported (IE11, latest Edge, latest Chrome, latest Fir
 ## How to use in your site
 See the examples or doc.md
 
+<<<<<<< HEAD
 ## Docker + Docker Compose
 
 The project includes a basic `docker-compose.yml` for development.  To run, execute the following:
@@ -43,6 +44,10 @@ $ docker build -t adolfintel/speedtest:latest .
 
 $ docker run -d --name  speedtest -p 0.0.0.0:80:80 adolfintel/speedtest:latest
 ```
+=======
+## Docker
+Please see the ```docker``` branch
+>>>>>>> master
 
 ## Donate
 If you want to support this project, you can [send a donation via PayPal](https://www.paypal.me/sineisochronic).
diff --git a/doc.md b/doc.md
index 7f8de9e..d3ce4f7 100644
--- a/doc.md
+++ b/doc.md
@@ -203,8 +203,9 @@ __Important:__ do not simply kill the worker while it's running, as it may leave
 These are the most common issues reported by users, and how to fix them
 
 #### Download test gives very low result
-Are garbage.php and empty.php (or your replacements) reachable?
-Press F12, select network and start the test. Do you see errors? (cancelled requests are not errors)
+Are garbage.php and empty.php (or your replacements) reachable?  
+Press F12, select network and start the test. Do you see errors? (cancelled requests are not errors)  
+If a small download starts, open it in a text editor. Does it say it's missing openssl_random_pseudo_bytes()? In this case, install OpenSSL (this is usually included when you install Apache and PHP on most distros).
 
 #### Upload test is inaccurate, and I see lag spikes
 Check your server's maximum POST size, make sure it's at least 20Mbytes, possibly more