Leftover changes from a merge.