update conflict file