Localisation update
merg resolve