fix conflicts in order_updater_spec