fix a botched merge