shipping rates out of core
fix conflict