merge conflicts again

foundation/www/docs/user/manual/en/human-resources/index.txt

@@ -13,4 +13,4 @@ human-resources-reports
 human-resource-setup
 setup
 articles
-employee-onboarding-and-separation
+employee-onboarding-and-separation

foundation/www/docs/user/manual/en/website/blog-post.md

@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Blog Post
 
 Blogs are a great way to share your thoughts about your business and keep your

foundation/www/docs/user/manual/en/website/shopping-cart.md

@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Shopping Cart
 
 On the Webpage, a shopping cart is an icon that allows you to store all the

foundation/www/docs/user/manual/en/website/web-form.md

@@ -61,4 +61,8 @@ When website user submits the form, the data will be stored in the document/doct
 
 For customizing web forms, see the [Frappe Documentation of Web Forms](https://frappe.io/docs/user/en/guides/portal-development/web-forms)
 
-{next}
+### Customizing
+
+For customizing web forms, see the [Frappe Documentation of Web Forms](https://frappe.io/docs/user/en/guides/portal-development/web-forms)
+
+{next}