manual fix of botched merge