did changes in grandtotal in cart list
removed conflicts
Merge branch 'master' of https://github.com/iamtopnwk/Eshop.git