Some changes to the merge