attempt resolve merge conflicts of dev to chrome_order_fix