udate get and merge dbf
resolve conflict