fixed lingering merge artifacts