update git
solve conflict