Manual merge of commits