add products
resolve merge cofilict
added notes, completed coding
aa