@@ -0,0 +1,534 @@
+package com.qualcomm.ftcrobotcontroller.opmodes.customCode;%0A%0Aimport com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;%0A%0Apublic class ETBaseOpMode extends LinearOpMode %7B%0A  public void etInit() throws InterruptedException %7B%0A    %0A  %7D%0A  public void etSetup() throws InterruptedException %7B%0A    %0A  %7D%0A  public void etLoop() throws InterruptedException %7B%0A    %0A  %7D%0A  @Override%0A  public void runOpMode()  throws InterruptedException %7B%0A    etInit();%0A    waitForStart();%0A    etSetup();%0A    while(opModeIsActive()) %7B%0A      etLoop();%0A    %7D%0A  %7D%0A%7D

Fix merge conflicts