just test conflict
  test conflict by master
  note the git learning
  ....
fix conflict
update learnGit...