fixed updating memberships when order status complete
fixed merge