fixed lingering merge problems