Implement basic state resolver and shipping states for order
Missed conflict