Merge of changes