add openmp
merge fixing
project files change