# Conflicts: # hermesv3_gr/modules/emision_inventories/emission_inventory.py # hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py Merge done