update
solve confilct