fixed merge issues for good