fixing merge conflict

- left from previous merge of upstream