Revert "Resolution bug 1ere commande"

This reverts commit 2a26c83b14088bd8a8ad3dc9bc2dbd1129b263f7.
Revert "Revert "Resolution bug 1ere commande""

This reverts commit f804985d217894067f106709918733dd6f94543c.
Merge remote-tracking branch 'origin/master'