diff --git a/GhidraESP8266_2/src/main/help/help/TOC_Source.xml b/GhidraESP8266_2/src/main/help/TOC_Source.xml
similarity index 100%
rename from GhidraESP8266_2/src/main/help/help/TOC_Source.xml
rename to GhidraESP8266_2/src/main/help/TOC_Source.xml
diff --git a/GhidraESP8266_2/src/main/help/help/shared/Frontpage.css b/GhidraESP8266_2/src/main/help/shared/DefaultStyle.css
similarity index 100%
rename from GhidraESP8266_2/src/main/help/help/shared/Frontpage.css
rename to GhidraESP8266_2/src/main/help/shared/DefaultStyle.css
diff --git a/GhidraESP8266_2/src/main/help/help/topics/ghidraesp8266_2/help.html b/GhidraESP8266_2/src/main/help/topics/ghidraesp8266_2/help.html
similarity index 91%
rename from GhidraESP8266_2/src/main/help/help/topics/ghidraesp8266_2/help.html
rename to GhidraESP8266_2/src/main/help/topics/ghidraesp8266_2/help.html
index 8f858d2..595710b 100644
--- a/GhidraESP8266_2/src/main/help/help/topics/ghidraesp8266_2/help.html
+++ b/GhidraESP8266_2/src/main/help/topics/ghidraesp8266_2/help.html
@@ -10,7 +10,7 @@
Skeleton Help File for a Module
-
+
diff --git a/GhidraESP8266_2/src/main/java/ghidraesp8266_2/GhidraESP8266_2Loader.java b/GhidraESP8266_2/src/main/java/ghidraesp8266_2/GhidraESP8266_2Loader.java
index b211dbd..1a4e9b9 100644
--- a/GhidraESP8266_2/src/main/java/ghidraesp8266_2/GhidraESP8266_2Loader.java
+++ b/GhidraESP8266_2/src/main/java/ghidraesp8266_2/GhidraESP8266_2Loader.java
@@ -30,7 +30,6 @@
import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressOverflowException;
import ghidra.program.model.data.DataType;
-import ghidra.program.model.data.DataTypeConflictException;
import ghidra.program.model.data.DataUtilities;
import ghidra.program.model.data.DataUtilities.ClearDataMode;
import ghidra.program.model.lang.LanguageCompilerSpecPair;
@@ -145,9 +144,6 @@ public Data createData(Program program, Listing listing, Address address, DataTy
catch (CodeUnitInsertionException e) {
Msg.warn(this, "Data markup conflict at " + address);
}
- catch (DataTypeConflictException e) {
- Msg.error(this, "Data type markup conflict:" + e.getMessage());
- }
return null;
}