fixed more merge conflicts for howler