manual merge of branch