fix merge conflict

sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java

@@ -55,7 +55,6 @@ private static void createsEnvelopeDirPath(SentryOptions options, Context contex
   }
 
   private static void addProcessors(SentryOptions options, Context context) {
-    //    options.addEventProcessor(new MainEventProcessor(options));
     options.addEventProcessor(new DefaultAndroidEventProcessor(context, options));
   }
 }

sentry-core/src/main/java/io/sentry/core/exception/SentryExceptionReader.java

@@ -75,7 +75,7 @@ private static SentryException createSentryException(
   private static List<SentryStackFrame> getStackFrames(StackTraceElement[] elements) {
     List<SentryStackFrame> sentryStackFrames = new ArrayList<>();
 
-    for(StackTraceElement item : elements) {
+    for (StackTraceElement item : elements) {
       SentryStackFrame sentryStackFrame = new SentryStackFrame();
       sentryStackFrame.setModule(item.getClassName());
       sentryStackFrame.setFunction(item.getMethodName());

sentry-core/src/main/java/io/sentry/core/protocol/SentryStackFrame.java

@@ -19,12 +19,12 @@ public class SentryStackFrame implements IUnknownPropertiesConsumer {
   private String contextLine;
   private Boolean inApp;
   private String _package; // TODO: _package as its a reserverd word
+  private Boolean _native; // TODO: _native as its a reserverd word
   private String platform;
   private Long imageAddr;
   private Long symbolAddr;
   private Long instructionAddr;
   private Map<String, Object> unknown;
-  // TODO: missing locals?
 
   public List<String> getPreContext() {
     return preContext;
@@ -162,12 +162,12 @@ public void setInstructionAddr(Long instructionAddr) {
     this.instructionAddr = instructionAddr;
   }
 
-  public Boolean getNative() {
-    return isNative;
+  public Boolean isNative() {
+    return _native;
   }
 
-  public void setNative(Boolean isNative) {
-    this.isNative = isNative;
+  public void setNative(Boolean _native) {
+    this._native = _native;
   }
 
   @Override