fix incorrectly patched merge.