fixed merge issues again