git conflict

src/main/java/nl/fairbydesign/backend/ncbi/objects/esample/RUNSET.java

@@ -12,14 +12,4 @@ public class RUNSET{
     public void setRUN(ArrayList<RUN> rUN) {
 		 this.rUN = rUN; }
     ArrayList<RUN> rUN = new ArrayList<>();
-    }
-=======
-public class RUNSET{
-    @JsonProperty("RUN")
-    public RUN getRUN() {
-		 return this.rUN; } 
-    public void setRUN(RUN rUN) { 
-		 this.rUN = rUN; } 
-    RUN rUN;
 }
->>>>>>> 3d2e7bc368880c32d40198f9fb320f8e742a6eea