merge rtsp client into main executive