diff --git a/docs/sources/docker-hub/builds.md b/docs/sources/docker-hub/builds.md
index a3b0d4da6a..e3e2139f0a 100644
--- a/docs/sources/docker-hub/builds.md
+++ b/docs/sources/docker-hub/builds.md
@@ -63,7 +63,6 @@ public or private GitHub repositories with a `Dockerfile`.
 
 ### GitHub Submodules
 
-<<<<<<< HEAD
 If your GitHub repository contains links to private submodules, you'll
 need to add a deploy key from your Docker Hub repository. 
 
@@ -71,16 +70,6 @@ Your Docker Hub deploy key is located under the "Build Details"
 menu on the Automated Build's main page in the Hub. Add this key
 to your GitHub submodule by visiting the Settings page for the
 repository on GitHub and selecting "Deploy keys".
-=======
-### GitHub Submodules
-
-If your repository contains links to private submodules, you'll need
-to add a deploy key from Docker Hub. 
-
-Your Docker Hub deploy key is located under the "Build Details" menu on 
-the automated build's main page in the Hub. Add this key to your GitHub 
-submodule by visiting the Settings page for the repository on GitHub and 
-selecting "Deploy keys".
 
 <table class="table table-bordered">
   <thead>
@@ -107,14 +96,6 @@ deploy key from your Docker Hub Automated Build.</td>
 </table>
      
 ### GitHub Organizations
-=======
-      <td>In your GitHub submodule's repository Settings page, add the deploy key from your Docker Hub automated build.</td>
-    </tr>
-  </tbody>
-</table>
-
-### GitHub organizations
->>>>>>> dc8b070aaa6c0aa0a6f920ba1a033027b5700ee0
 
 GitHub organizations will appear once your membership to that organization is
 made public on GitHub. To verify, you can look at the members tab for your