Fix merge conflict in hvac_library.osm