resolve merge conflict

Snakefile

@@ -75,7 +75,7 @@ if config["foresight"] == "perfect":
 rule all:
     input:
         RESULTS + "graphs/costs.pdf",
-        expand(RESULTS + "maps/power-network-{clusters}.pdf", **config["scenario"]),
+        expand(RESULTS + "maps/power-network-s{simpl}-{clusters}.pdf", **config["scenario"]),
         expand(
             RESULTS
             + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf",

rules/postprocess.smk

@@ -16,9 +16,8 @@ if config["foresight"] != "perfect":
             network=RESOURCES + "networks/elec_s{simpl}_{clusters}.nc",
             regions_onshore=RESOURCES
             + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
-            rc="matplotlibrc",
         output:
-            map=RESULTS + "maps/power-network-{clusters}.pdf",
+            map=RESULTS + "maps/power-network-s{simpl}-{clusters}.pdf",
         threads: 1
         resources:
             mem_mb=4000,

scripts/plot_power_network_clustered.py

@@ -24,8 +24,6 @@ if __name__ == "__main__":
             configfiles=["../../config/config.test.yaml"],
         )
 
-    plt.style.use(snakemake.input.rc)
-
     lw_factor = 2e3
 
     n = pypsa.Network(snakemake.input.network)