Fixed bad merge artifact.