Fix post-merge issues (pom.xml conflicts)

Author: reta

distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml

@@ -126,11 +126,7 @@
                     <plugin>
                         <groupId>org.graalvm.buildtools</groupId>
                         <artifactId>native-maven-plugin</artifactId>
-<<<<<<< HEAD
-                        <version>1.1.1</version>
-=======
                         <version>1.1.3</version>
->>>>>>> 22985c3ffb8 (Bump org.graalvm.buildtools:native-maven-plugin from 1.1.2 to 1.1.3 (#3269))
                         <executions>
                             <execution>
                                 <goals>

distribution/src/main/release/samples/jaxws_graalvm/pom.xml

@@ -147,11 +147,7 @@
                     <plugin>
                         <groupId>org.graalvm.buildtools</groupId>
                         <artifactId>native-maven-plugin</artifactId>
-<<<<<<< HEAD
-                        <version>1.1.1</version>
-=======
                         <version>1.1.3</version>
->>>>>>> 22985c3ffb8 (Bump org.graalvm.buildtools:native-maven-plugin from 1.1.2 to 1.1.3 (#3269))
                         <executions>
                             <execution>
                                 <goals>