fix cli pom that was committed in a conflict state