update file6 with 555555
conflict solved