Updated ad engine to retrieve merchant name
Resolved merge conflicts