Fix merge and update pom to 1.2.1