think i fixed merge issues