revert last commit and import catkin_pkg after it is installed