botched merge, fixed at home