fix bad merge of upstream config