Fixed coflicts for merge

CHANGELOG.md

configure.ac

example/Vector/0_simple/main.cpp

install

m4/immdx_lib_parmetis.m4

openfpm_data

openfpm_devices

openfpm_vcluster

script/discover_package_manager

script/install_BOOST.sh

script/install_EIGEN.sh

script/install_HDF5.sh

script/install_MPI.sh

script/install_Metis.sh

script/install_PETSC.sh

script/install_Parmetis.sh

script/install_SUITESPARSE.sh

script/pre_req

script/remove_old

script/set_mpi