add first version of ad
fix conflict