diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 57aa39df..d8bb5bb0 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -1,10 +1,7 @@
 Sentry.init do |config|
-<<<<<<< HEAD
   config.enabled_environments = %|production staging|
   config.dsn = ENV['SENTRY_DSN']
-=======
-  config.dsn = ENV.fetch('OSEM_SENTRY_DSN', Rails.application.secrets.sentry_dsn)
->>>>>>> osem-master
+  # config.dsn = ENV.fetch('OSEM_SENTRY_DSN', Rails.application.secrets.sentry_dsn)
   config.breadcrumbs_logger = [:active_support_logger]
 
   # To activate performance monitoring, set one of these options.