diff --git a/rpcs3/Loader/ISO.cpp b/rpcs3/Loader/ISO.cpp
index 721471834f..558dcc54ab 100644
--- a/rpcs3/Loader/ISO.cpp
+++ b/rpcs3/Loader/ISO.cpp
@@ -413,13 +413,8 @@ inline T retrieve_endian_int(const u8* buf)
 	return out;
 }
 
-<<<<<<< add_encrypted_iso
 // Assumed that directory entry is at file head
-static std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& file, bool names_in_ucs2 = false)
-=======
-// assumed that directory_entry is at file head
 static std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& entry, bool names_in_ucs2 = false)
->>>>>>> master
 {
 	const auto start_pos = entry.pos();
 	const u8 entry_length = entry.read<u8>();