update the document from git
fix merge conflict