Restore correct POM

pom.xml

@@ -7,11 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.talend</groupId>
-<<<<<<< HEAD
-    <artifactId>org.talend.tis-shared</artifactId>
-=======
     <artifactId>org.talend.tos</artifactId>
->>>>>>> release/5.5.1/tos
     <version>5.5.1</version>
 
     <packaging>pom</packaging>
@@ -21,26 +17,11 @@
     </properties>
 
     <modules>
-<<<<<<< HEAD
-        <module>org.talend.remote.commons</module>
-        <module>org.talend.remote.jobserver.commons</module>
-=======
         <module>org.talend.utils</module>
->>>>>>> release/5.5.1/tos
     </modules>
 
 	<distributionManagement>
 		<repository>
-<<<<<<< HEAD
-			<id>tis-releases</id>
-			<name>TIS releases Repository</name>
-			<url>${tis.releases.repo.url}</url>
-		</repository>
-		<snapshotRepository>
-			<id>tis-snapshots</id>
-			<name>TIS snapshots Repository</name>
-			<url>${tis.snapshots.repo.url}</url>
-=======
 			<id>tos-releases</id>
 			<name>TOS releases Repository</name>
 			<url>${tos.releases.repo.url}</url>
@@ -49,8 +30,8 @@
 			<id>tos-snapshots</id>
 			<name>TOS snapshots Repository</name>
 			<url>${tos.snapshots.repo.url}</url>
->>>>>>> release/5.5.1/tos
 		</snapshotRepository>
 	</distributionManagement>
 
 </project>
+