add ex8
remove the git conflict code
finish ex8