Correct bad merge.