update catkin branch to latest pr