shows my ads
merge conflict