merge of changes