commit before merge upstream