test de resolution de conflit
Merge branch 'master' of github.com:baptistedeleplace/3wa-php