fixed merge conflict in show new product