fix merge conflict

sentry-core/src/main/java/io/sentry/core/SentryOptions.java

@@ -24,6 +24,7 @@ public class SentryOptions {
   private String cacheDirPath;
   private String release;
   private String environment;
+  private Proxy proxy;
 
   public void addEventProcessor(EventProcessor eventProcessor) {
     eventProcessors.add(eventProcessor);
@@ -148,6 +149,14 @@ public void setEnvironment(String environment) {
     this.environment = environment;
   }
 
+  public Proxy getProxy() {
+    return proxy;
+  }
+
+  public void setProxy(Proxy proxy) {
+    this.proxy = proxy;
+  }
+
   public interface BeforeSendCallback {
     SentryEvent execute(SentryEvent event);
   }