Add test case
mend
Fix conflicts in pom