chore: Resolve conflicts
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index d93c581..066249b 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -80,14 +80,7 @@
 	"Holiday List",
 ]
 
-website_generators = [
-	"Item Group",
-	"Website Item",
-	"BOM",
-	"Sales Partner",
-	"Job Opening",
-	"Student Admission",
-]
+website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner", "Job Opening"]
 
 website_context = {
 	"favicon": "/assets/erpnext/images/erpnext-favicon.svg",