Branch1

AnotherClass.java

@@ -0,0 +1 @@
+this is not java class

app/src/main/java/zone/eloy/projects/androidcalculator/NewClass.java

@@ -0,0 +1,32 @@
+package zone.eloy.projects.androidcalculator;
+
+public class NewClass {
+
+    public NewClass() {
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj);
+    }
+
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        super.finalize();
+    }
+}

conflict.txt

@@ -0,0 +1 @@
+my roll is 65