regame the git 
this is a cool tool.
<<<<<<< HEAD
wwo change the code
=======
wwo change the code
>>>>>>> feature1

eric_branch add something here.