diff --git a/src/publisher_tf.cpp b/src/publisher_tf.cpp
index af32b73f629f80bc63b20947cfbf1482086912c2..044f820a1646195c3a9406607c35eb1e90de00a3 100644
--- a/src/publisher_tf.cpp
+++ b/src/publisher_tf.cpp
@@ -47,13 +47,6 @@ PublisherTf::PublisherTf(const std::string& _unique_name,
     T_odom2base_.frame_id_ = odom_frame_id_;
     T_odom2base_.child_frame_id_ = base_frame_id_;
     T_odom2base_.stamp_ = ros::Time::now();
-<<<<<<< HEAD
-    //T_map2odom_.setIdentity();
-    //T_map2odom_.frame_id_ = map_frame_id_;
-    //T_map2odom_.child_frame_id_ = odom_frame_id_;
-    //T_map2odom_.stamp_ = ros::Time::now();
-=======
->>>>>>> devel
     Tmsg_map2odom_.child_frame_id = odom_frame_id_;
     Tmsg_map2odom_.header.frame_id = map_frame_id_;
     Tmsg_map2odom_.header.stamp = ros::Time::now();