add jiathis and solve conflict in wrapFlashVideos()