Testing things with openmp
Fixed merge conflicts