Merge branch 'master' of C:\Users\server-pc\NextVersion\version 2\MyClub with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Maps modif