merge upstream defines