Resolved rewrite clashes with Multi-Warehouse module V 1.2.1