Fix Docs for Git
Fix conflict new
Fix thinhnv branch