Botched merge, manual fix