Fixed bad merge.