solved conflicts#47

Philimuhire wants to merge 1 commit intodemo-fn-19-07atlp-rwanda/e-commerce-crafters-fn:demo-fn-19-07from

ft-homepageatlp-rwanda/e-commerce-crafters-fn:ft-homepageCopy head branch name to clipboard