update and fix conflicts
update pom according spark-2706