push file to github version
solve conflict