- manual merge of changes