Fix error during manual merge.