Adaptation multi-résolutions
Fixing merge