diff --git a/setup.ini b/setup.ini
index b500796..fd4b09a 100644
--- a/setup.ini
+++ b/setup.ini
@@ -1,17 +1,11 @@
-
 [TOR]
-firefox_binary_path = C:\\Users\\minhkhoitran\\Desktop\\Tor Browser\\Browser\\firefox.exe
-firefox_profile_path = C:\\Users\\minhkhoitran\\Desktop\\Tor Browser\\Browser\\TorBrowser\\Data\\Browser\\profile.default
-geckodriver_path = C:\\NSF-REU\\dw_pipeline_test\\selenium\\geckodriver.exe
+firefox_binary_path = C:\Users\calsyslab\Desktop\Tor Browser\Browser\firefox.exe
+firefox_profile_path = C:\Users\calsyslab\Desktop\Tor Browser\Browser\TorBrowser\Data\Browser\profile.default
+geckodriver_path = C:\Users\calsyslab\Projects\dw_pipeline_test\selenium\geckodriver.exe
 
 [Project]
-<<<<<<< HEAD
-project_directory = C:\\NSF-REU\\dw_pipeline_test\
+project_directory = C:\Users\calsyslab\Projects\dw_pipeline_test
 shared_folder = \\VBoxSvr\Shared
-=======
-project_directory = C:\\NSF-REU\\dw_pipeline_test
-shared_folder = \\VBoxSvr\\VM_Files_(shared)
->>>>>>> 6485ddb42552dee0b828f020640f169235a9b5a8
 
 [PostgreSQL]
 ip = localhost