solve some error for result
solve conflict
solve conflict