fixed some lingering merge issues