Update no conflict