Fix incomplete merge.