added after-convergence localization to nemo
fixed conflict