continue to fix merge of master