Fix merge of branches.