solved merge issues