add tablet ad
fix conflict