unmergable1
resolve conflicts
Merge pull request #18 from hao1987/MY_resoleve_conflicts

My resoleve conflicts