included the ordering for cv_neiloc calculation of cvfem_neiloc - switched off at the moment
resolved conflict