Added ad.
fixed merge