OpenMP working
fixed conflicts