From 474433def41502b70de8a5deb1b9fcb0e5bff2b3 Mon Sep 17 00:00:00 2001
From: Vivek Shankar Varadharajan <vivek-shankar.varadharajan@polymtl.ca>
Date: Fri, 7 Oct 2016 16:33:21 -0400
Subject: [PATCH] change in top conflict commit

---
 src/rosbuzz.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rosbuzz.cpp b/src/rosbuzz.cpp
index 613efa6..1fefb0b 100644
--- a/src/rosbuzz.cpp
+++ b/src/rosbuzz.cpp
@@ -210,11 +210,11 @@ int main(int argc, char **argv)
 
   ros::Subscriber battery_sub = n_c.subscribe("battery_state", 1000, battery);
 
-  ros::Subscriber payload_sub = n_c.subscribe("payload_in", 1000, payload_obt);
+  ros::Subscriber payload_sub = n_c.subscribe("inMavlink", 1000, payload_obt);
 
 
   /*publishers*/
-  ros::Publisher payload_pub = n_c.advertise<mavros_msgs::Mavlink>("payload_out", 1000);
+  ros::Publisher payload_pub = n_c.advertise<mavros_msgs::Mavlink>("outMavlink", 1000);
 
   /* Clients*/
   ros::ServiceClient mav_client = n_c.serviceClient<mavros_msgs::CommandInt>("djicmd");