Fix rebase fail in 152238b4cff7ab4c4ce63ba26abd23b0abf05129.

diff --git a/lib/seed_data/categories.rb b/lib/seed_data/categories.rb
index 42e9fb4..abc4a61 100644
--- a/lib/seed_data/categories.rb
+++ b/lib/seed_data/categories.rb
@@ -159,11 +159,7 @@ module SeedData
     end
 
     def find_category(site_setting_name)
-<<<<<<< HEAD
       category_id = SiteSetting.get(site_setting_name)
-=======
-      category_id = SiteSetting.public_send(site_setting_name)
->>>>>>> DEV: Prefer `public_send` over `send`.
       Category.find_by(id: category_id) if category_id > 0
     end

GitHub sha: 1e7c4592