merge of the branches