manual merge of changes