merge of overwritten change