add adwhirl sdk
fix conflict