update
resolve confilct