fixed some additional merge issues