unmergable2
resolve conflicts
Merge pull request #20 from hao1987/MY_resolve_conflicts

My resolve conflicts