resolver conflict
Merge branch 'master' of github.com:zhangping19880920/aopujidianlauncher