unmergable1
resolve the conflicts
Merge pull request #14 from hao1987/MY_ci_resolve_conflicts

My ci resolve conflicts