be happy with git
be happy with Git
fix confict in README file