manual merge of ignore files