git rebase -> jikkou9.txt: step8 1st conflic

Signed-off-by: HL <lecaoquochung@gmail.com>
git rebase->jikkou9.txt->2nd conflic margin
Signed-off-by: HL <lecaoquochung@gmail.com>
git rebase->jikkou9.txt->Step8 merge conflic margin

Signed-off-by: HL <lecaoquochung@gmail.com>
git rebase->jikkou9.txt->Step5

Signed-off-by: HL <lecaoquochung@gmail.com>
git rebase->jikkou9.txt->Step6

Signed-off-by: HL <lecaoquochung@gmail.com>
git rebase->jikkou9.txt->Step7

Signed-off-by: HL <lecaoquochung@gmail.com>