Fix build...
Mod pom.xml
Resolve conflict.