Some changes on the merge.