fix(qanda) removed merge text and added productId
fix(qanda) fixed merge error