Resolution conflits
Merge branch 'master' of https://github.com/stephanecollot/My-M-GaTE