vehicle add ref sales order
merge conflict