fixed errors in beauty pom and java-sample pom caused by errors in
resolving merge conflicts