Merge branch 'master' of /Users/valentindufermont/IdeaProjects/tpecommerce with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'