update desc
resolve conflict
build