order status
fixes merge conflict