please no errors

Author: shushi93

src/main/java/resource/modid/mixin/TitleScreenMixin.java

@@ -4,22 +4,16 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
-<<<<<<< HEAD
 import net.minecraft.client.gui.screens.worldselection.SelectWorldScreen;
-=======
->>>>>>> dbec9be (sync local code (redirect button to screen isnt working yet))
 import net.minecraft.network.chat.Component;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-<<<<<<< HEAD
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-=======
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import resource.modid.gui.ExampleGui;
 import resource.modid.gui.ExampleScreen;
->>>>>>> dbec9be (sync local code (redirect button to screen isnt working yet))
 
 @Mixin(TitleScreen.class)
 public class TitleScreenMixin extends Screen {
@@ -30,13 +24,9 @@ protected TitleScreenMixin(Component component) {
     @Inject(at = @At("RETURN"), method = "createNormalMenuOptions")
     private void addModButton(int i, int j, CallbackInfoReturnable<Integer> cir) {
         this.addRenderableWidget(
-<<<<<<< HEAD
-                Button.builder(Component.translatable("mod.button"), button -> Minecraft.getInstance().setScreen(new SelectWorldScreen(this)))
-=======
-                Button.builder(Component.translatable("mixin.TitleScreenMixin.modButton"), button -> Minecraft.getInstance().setScreen(new ExampleScreen(new ExampleGui())))
->>>>>>> dbec9be (sync local code (redirect button to screen isnt working yet))
-                        .bounds(this.width / 2 - 100 + 205, i, 20, 20)
-                        .build()
+            Button.builder(Component.translatable("mixin.TitleScreenMixin.modButton"), button -> Minecraft.getInstance().setScreen(new ExampleScreen(new ExampleGui())))
+                    .bounds(this.width / 2 - 100 + 205, i, 20, 20)
+                    .build()
         );
     }
 }

src/main/resources/assets/resource-screening/lang/en_US.json

@@ -1,9 +1,3 @@
 {
-<<<<<<< HEAD
-  "mod.button": "Hi"
-=======
-  "mixin.TitleScreenMixin.modButton": "Hi",
-  "gui.examplegui.buttonTest": "Test",
-  "gui.examplegui.labelTest": "Test"
->>>>>>> dbec9be (sync local code (redirect button to screen isnt working yet))
+  "mixin.TitleScreenMixin.modButton": "Hi"
 }

src/main/resources/resource-screening.mixins.json

@@ -3,37 +3,23 @@
   "package": "resource.modid.mixin",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
-<<<<<<< HEAD
     "ExampleMixin",
     "TitleScreenMixin"
-=======
-    "ExampleMixin"
->>>>>>> dbec9be (sync local code (redirect button to screen isnt working yet))
   ],
   "injectors": {
     "defaultRequire": 1
   },
   "overwrites": {
     "requireAnnotations": true
   },
-<<<<<<< HEAD
-  "parent": "",
   "mixinPriority": -1,
-  "server": [],
-  "minVersion": "",
-  "plugin": "",
   "setSourceFile": false,
   "priority": -1,
-  "refmap": "",
-  "target": "",
-  "verbose": false
-=======
+  "verbose": false,
   "client": [
-    "TitleScreenMixin",
-    "ResourceScreenMixin"
+    "TitleScreenMixin"
   ],
   "mixinextras": {
     "minVersion": "0.5.3"
   }
->>>>>>> dbec9be (sync local code (redirect button to screen isnt working yet))
 }