Added acceptance of terms at checkout
fixing conflicts