diff --git a/background.js b/background.js
index 8627794..23e0e45 100644
--- a/background.js
+++ b/background.js
@@ -13,6 +13,7 @@ const SCHOOL_IDS = [
 ];
 
 // for searchProfessor and getProfessor, use a self hosted proxy to bypass CORS restrictions
+<<<<<<< HEAD
 const searchProfessor = async (name, schoolIDs) => {
   for (const schoolID of schoolIDs) {
     const response = await fetch(
@@ -142,4 +143,4 @@ chrome.runtime.onConnect.addListener((port) => {
       port.postMessage({error});
     });
   });
-});
\ No newline at end of file
+});