diff --git a/TestFiles/A third test.md b/TestFiles/A third test.md
index aebbec6d..423b1320 100644
--- a/TestFiles/A third test.md	
+++ b/TestFiles/A third test.md	
@@ -16,6 +16,10 @@
 
 
 
+
+[](folder/Fiile)
+
+
 [[Another Test]]
 
 
diff --git a/TestFiles/folder/File.md b/TestFiles/folder/Fiile.md
similarity index 84%
rename from TestFiles/folder/File.md
rename to TestFiles/folder/Fiile.md
index 09735443..6295ff8e 100644
--- a/TestFiles/folder/File.md
+++ b/TestFiles/folder/Fiile.md
@@ -1,11 +1,10 @@
+
 [[Another Test]]
 
 # Heading
 
 #tag/subtag
 
-[[^]]
-
 
 Here is a very simple and normal paragraph man!!!!   ^1
 
@@ -15,4 +14,4 @@ more footntoe[^2]
 [^2]: This is a different footntoe
 
 
-[[folder/File#^ZxY7P]]
+[[folder/Fiile#ZxY7P]]
diff --git a/src/vault/mod.rs b/src/vault/mod.rs
index 0fc76c73..a4f6c49c 100644
--- a/src/vault/mod.rs
+++ b/src/vault/mod.rs
@@ -1153,7 +1153,11 @@ pub struct Refname {
 }
 
 impl Refname {
+<<<<<<< HEAD
     pub fn link_file_key(&self) -> Option<String> {
+=======
+    fn link_file_key(&self) -> Option<String> {
+>>>>>>> a4009b25ad2199ae2979475f1d03afebf051d93a
 
         let path = &self.path.clone()?;