clean up botched merge.