Fixed unsuccessful merge.