unmerge2
resolve conflicts
buggy 2
ddfasfdsafsda
Merge pull request #21 from hao1987/MY_resolve_conflicts

My resolve conflicts