diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index 22ee0c2..d01e49e 100644
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -2,10 +2,7 @@ package StevenDimDoors.mod_pocketDim;
 
 
 import java.io.File;
-<<<<<<< HEAD
-import java.net.URL;
-=======
->>>>>>> 9a8510a705bbcfedccea599fa90fea3c98734253
+
 import java.util.ArrayList;
 import java.util.HashMap;