add app crawler
fix merge conflicts