Add parental to pom.
Merge conflict