diff --git a/source/fnc/symbols.d b/source/fnc/symbols.d
index 9b3fa59..862a560 100644
--- a/source/fnc/symbols.d
+++ b/source/fnc/symbols.d
@@ -266,7 +266,11 @@ final:
 
     Type type()
     {
+<<<<<<< HEAD
         return cast(Type) parents[$-1];
+=======
+        return cast(Type)parents[$-1];
+>>>>>>> c9077b19ca42d9c1540766c4968aeb1ed2fbc0f2
     }
 }