first merge of different branches