Update package.xml

Author: urfeex

ur_robot_driver/package.xml

@@ -2,17 +2,12 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ur_robot_driver</name>
-<<<<<<< HEAD
   <version>3.5.0</version>
-  <description>The new driver for Universal Robots UR3, UR5 and UR10 robots with CB3 controllers and the e-series.</description>
-=======
-  <version>4.3.0</version>
-    <description>
-      The ROS 2 driver for Universal Robots manipulators. This driver supports all robot
-      models as listed in the documentation. For robot controllers, PolyScope X, PolyScope 5 and
-      CB3 controllers are supported.
-    </description>
->>>>>>> 6968ae0 (Explicitly state PolyScope X compatibility (#1563))
+  <description>
+    The ROS 2 driver for Universal Robots manipulators. This driver supports all robot
+    models as listed in the documentation. For robot controllers, PolyScope X, PolyScope 5 and
+    CB3 controllers are supported.
+  </description>
 
   <maintainer email="[email protected]">Felix Exner</maintainer>
   <maintainer email="[email protected]">Rune Søe-Knudsen</maintainer>