diff --git a/config/config.default.yaml b/config/config.default.yaml
index d2d548e9..93c40e45 100644
--- a/config/config.default.yaml
+++ b/config/config.default.yaml
@@ -266,12 +266,15 @@ lines:
   s_nom_max: .inf
   length_factor: 1.25
   under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity
+<<<<<<< HEAD
   dynamic_line_rating:
     activate: false
     # factor compensate overestimation of the wind speed in hourly averaged wind data
     correction_factor: 0.95
     max_voltage_difference: 45 # in deg or `false` to disable
     max_line_rating: false # over capacity relative to nominal capacity e.g. 1.3 or `false`to disable
+=======
+>>>>>>> master
 
 links:
   p_max_pu: 1.0
diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py
index b174fc25..09ec340a 100755
--- a/scripts/add_electricity.py
+++ b/scripts/add_electricity.py
@@ -859,8 +859,6 @@ if __name__ == "__main__":
             attach_OPSD_renewables(n, tech_map)
         estimate_renewable_capacities(n, snakemake.config)
 
-    estimate_renewable_capacities(n, snakemake.config)
-
     update_p_nom_max(n)
 
     line_rating_config = snakemake.config["lines"]["dynamic_line_rating"]