update history
solve conflict