Fixed the problems with the merge.