Fix messed up commit and merge.