failed merge
submit order, checkout view

complete and tested
error message