fixing some leftover merge issues