fix conflicts
fix conflicts

ScazLab/baxter_collaboration,ScazLab/human_robot_collaboration,ScazLab/baxter_collaboration,ScazLab/human_robot_collaboration,ScazLab/baxter_collaboration,ScazLab/human_robot_collaboration,ScazLab/baxter_collaboration,ScazLab/human_robot_collaboration