本地冲突处理
Merge branch 'master' of https://github.com/vigour/myproject.git
Merge branch 'master' of https://github.com/vigour/myproject.git
修改POM 覆盖