Fixes some of the conflicts after merge.