created createOrder function
fixed merge conflicts