before pull
fix conflict pom
test array