name conflict resolved ...should work again