push machine
correction de conflits machine.c