fix doc Makefile

doc/Makefile

@@ -3,10 +3,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-<<<<<<< Updated upstream
-=======
 PAPER         = letter
->>>>>>> Stashed changes
 BUILDDIR      = _build
 
 # Internal variables.
@@ -29,14 +26,9 @@ html:
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
 tarball: all
-<<<<<<< Updated upstream
 	cd $(BUILDDIR)/html && tar cvzf ../../../_doc.tgz *
 	cd ../../
 	@echo
-=======
-	cd $(BUILDDIR)/html && tar cvzf ../../../_doc.tgz *  & cd ../../
->>>>>>> Stashed changes
-
 
 pdf: latex
 	cd $(BUILDDIR)/latex && make all-pdf