omp merge checked in!