2
resolve conflicts
Merge pull request #17 from hao1987/MY_resolve

My resolve