template added successfully
prodcut page also integrated
merge conflict resolved