Add catkin
fix conflict