resolve cherry merge conflict 2

envs/environment.yaml

@@ -37,6 +37,7 @@ dependencies:
   - matplotlib
   - proj
   - fiona <= 1.18.20  # Till issue https://github.com/Toblerity/Fiona/issues/1085 is not solved
+  - country_converter
 
   # Keep in conda environment when calling ipython
   - ipython
@@ -50,7 +51,6 @@ dependencies:
   - geopy
   - tqdm
   - pytz
-  - country_converter
   - tabula-py
 
   - pip:

scripts/build_hydro_profile.py

@@ -79,6 +79,7 @@ def get_eia_annual_hydro_generation(fn, countries):
     df.loc["Germany"] = df.filter(like='Germany', axis=0).sum()
     df.loc["Serbia"] += df.loc["Kosovo"]
     df = df.loc[~df.index.str.contains('Former')]
+    df.drop(["Europe", "Germany, West", "Germany, East"], inplace=True)
 
     df.index = cc.convert(df.index, to='iso2')
     df.index.name = 'countries'