diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py
index 1c620989..abdd0a8d 100644
--- a/scripts/add_existing_baseyear.py
+++ b/scripts/add_existing_baseyear.py
@@ -23,9 +23,10 @@ from _helpers import (
 )
 from add_electricity import sanitize_carriers
 from prepare_sector_network import cluster_heat_buses, define_spatial, prepare_costs
+
+from scripts.enums.HeatSector import HeatSector
 from scripts.enums.HeatSystem import HeatSystem
 from scripts.enums.HeatSystemType import HeatSystemType
-from scripts.enums.HeatSector import HeatSector
 
 logger = logging.getLogger(__name__)
 cc = coco.CountryConverter()
@@ -457,6 +458,7 @@ def add_heating_capacities_installed_before_baseyear(
         else:
             nodes_elec = nodes
 
+<<<<<<< HEAD
             too_large_grouping_years = [gy for gy in grouping_years if gy >= int(baseyear)]
             if too_large_grouping_years:
                 logger.warning(
@@ -469,6 +471,28 @@ def add_heating_capacities_installed_before_baseyear(
                     if int(grouping_year) + default_lifetime > int(baseyear)
                     and int(grouping_year) < int(baseyear)
                 ]
+=======
+        # Add heat pumps
+        heat_source = snakemake.params.heat_pump_sources[heat_system.system_type.value]
+        costs_name = f"{heat_system.system_type} {heat_source}-sourced heat pump"
+
+        efficiency = (
+            cop.sel(
+                heat_system=heat_system.system_type.value,
+                heat_source=heat_source,
+                name=nodes,
+            )
+            .to_pandas()
+            .reindex(index=n.snapshots)
+            if options["time_dep_hp_cop"]
+            else costs.at[costs_name, "efficiency"]
+        )
+
+        too_large_grouping_years = [gy for gy in grouping_years if gy >= int(baseyear)]
+        if too_large_grouping_years:
+            logger.warning(
+                f"Grouping years >= baseyear are ignored. Dropping {too_large_grouping_years}."
+>>>>>>> 0259e066e4a5688d002e47ec9b34bc9e45ae437d
             )
 
             assert valid_grouping_years.is_monotonic_increasing
@@ -519,19 +543,42 @@ def add_heating_capacities_installed_before_baseyear(
                 suffix=f" {heat_system} resistive heater-{grouping_year}",
                 bus0=nodes_elec,
                 bus1=nodes + " " + heat_system.value + " heat",
+<<<<<<< HEAD
                 carrier=heat_system.value + " resistive heater",
                 efficiency=costs.at[heat_system.resistive_heater_costs_name, "efficiency"],
                 capital_cost=(
                     costs.at[heat_system.resistive_heater_costs_name, "efficiency"]
                     * costs.at[heat_system.resistive_heater_costs_name, "fixed"]
+=======
+                carrier=heat_system + " resistive heater",
+                efficiency=costs.at[
+                    f"{heat_system.system_type} resistive heater", "efficiency"
+                ],
+                capital_cost=(
+                    costs.at[
+                        f"{heat_system.system_type} resistive heater", "efficiency"
+                    ]
+                    * costs.at[f"{heat_system.system_type} resistive heater", "fixed"]
+>>>>>>> 0259e066e4a5688d002e47ec9b34bc9e45ae437d
                 ),
                 p_nom=(
                     existing_heating.loc[nodes, (heat_system.value, "resistive heater")]
                     * ratio
+<<<<<<< HEAD
                     / costs.at[heat_system.resistive_heater_costs_name, "efficiency"]
                 ),
                 build_year=int(grouping_year),
                 lifetime=costs.at[heat_system.resistive_heater_costs_name, "lifetime"],
+=======
+                    / costs.at[
+                        f"{heat_system.system_type} resistive heater", "efficiency"
+                    ]
+                ),
+                build_year=int(grouping_year),
+                lifetime=costs.at[
+                    f"{heat_system.system_type} resistive heater", "lifetime"
+                ],
+>>>>>>> 0259e066e4a5688d002e47ec9b34bc9e45ae437d
             )
 
             n.madd(
@@ -541,8 +588,15 @@ def add_heating_capacities_installed_before_baseyear(
                 bus0="EU gas" if "EU gas" in spatial.gas.nodes else nodes + " gas",
                 bus1=f"{nodes}  {heat_system} heat",
                 bus2="co2 atmosphere",
+<<<<<<< HEAD
                 carrier=heat_system.value + " gas boiler",
                 efficiency=costs.at[heat_system.gas_boiler_costs_name, "efficiency"],
+=======
+                carrier=heat_system + " gas boiler",
+                efficiency=costs.at[
+                    f"{heat_system.system_type} gas boiler", "efficiency"
+                ],
+>>>>>>> 0259e066e4a5688d002e47ec9b34bc9e45ae437d
                 efficiency2=costs.at["gas", "CO2 intensity"],
                 capital_cost=(
                     costs.at[heat_system.gas_boiler_costs_name, "efficiency"]
diff --git a/scripts/build_cop_profiles/run.py b/scripts/build_cop_profiles/run.py
index 6a4a0061..7e405a42 100644
--- a/scripts/build_cop_profiles/run.py
+++ b/scripts/build_cop_profiles/run.py
@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: MIT
 
+import sys
+
 import numpy as np
 import pandas as pd
 import xarray as xr
@@ -12,8 +14,6 @@ from DecentralHeatingCopApproximator import DecentralHeatingCopApproximator
 
 from scripts.enums.HeatSystemType import HeatSystemType
 
-import sys
-
 sys.path.append("..")