Fixing conflict

CHANGELOG.md

configure.ac

dep_dir

example/Grid/0_simple/main.cpp

example/Grid/3_gray_scott_3d/Makefile

example/Grid/3_gray_scott_3d/main.cpp

example/Grid/3_gray_scott_3d_vectorization/Makefile

example/Grid/3_gray_scott_3d_vectorization/config.cfg

example/Grid/3_gray_scott_3d_vectorization/main.cpp

example/Grid/3_gray_scott_3d_vectorization/update_new.f90

example/Numerics/PS-CMA-ES/Makefile

example/Numerics/PS-CMA-ES/f15_cec_const.hpp

example/Numerics/PS-CMA-ES/f15_cec_fun.hpp

example/Numerics/PS-CMA-ES/main.cpp

example/Numerics/Vortex_in_cell/Makefile

example/Numerics/Vortex_in_cell/main_vic_petsc.cpp

example/VCluster/0_simple/main.cpp

example/Vector/7_SPH_dlb_opt/main.cpp

images/vector.cpp

openfpm_data