fix merge of deep-*