modified learngit.java
 fix conflict