Fix issue with merge.