解决包依赖冲突
Merge branch 'master' of https://github.com/tomkrus007/luna.git