update conflict1 file