Fix update conflict