resolve update conflict
merge update