Fixing conflicts

CHANGELOG.md

example/Vector/0_simple/main.cpp

example/Vector/1_celllist/main.cpp

example/Vector/3_molecular_dynamic/Makefile

example/Vector/3_molecular_dynamic/main_vl_sym.cpp

example/Vector/4_multiphase_celllist/main.cpp

example/Vector/4_multiphase_celllist_verlet/Makefile

example/Vector/4_multiphase_celllist_verlet/config.cfg

example/Vector/4_multiphase_celllist_verlet/main.cpp

example/Vector/6_complex_usage/Makefile

example/Vector/6_complex_usage/main.cpp

openfpm_data

openfpm_devices

openfpm_io

openfpm_pdata.doc

openfpm_vcluster

script/install_PETSC.sh

src/Decomposition/ie_ghost.hpp

src/Grid/grid_dist_id.hpp

src/Grid/grid_dist_id_unit_test.cpp