moved hidra's global.conf into branch