Fixed merge issues with vector/matrix.