finally fixed merge issues