Version Merged et propre