manual merge of feat lock