mod pom.xml on dev
mod2 pom.xml on dev
fixed merge conflict on master