Fix error during merge.