Failed attempt at omp parallel
Fixed merge conflict