diff --git a/doc/costs.rst b/doc/costs.rst
index 68ebc12e..f56e40d3 100644
--- a/doc/costs.rst
+++ b/doc/costs.rst
@@ -43,11 +43,4 @@ Some cost assumptions (e.g. marginal cost and capital cost) can be directly over
 
 To change cost assumptions in more detail, modify cost assumptions directly in ``resources/costs.csv`` as this is not yet supported through the config file.
 
-<<<<<<< HEAD
 You can also build multiple different cost databases. Make a renamed copy of ``resources/costs.csv`` (e.g. ``data/costs-optimistic.csv``) and set the variable ``COSTS=data/costs-optimistic.csv`` in the ``Snakefile``.
-=======
-.. csv-table::
-   :header-rows: 1
-   :widths: 10,3,5,4,6,8
-   :file: ../data/costs.csv
->>>>>>> master