diff --git a/src/regexps.py b/src/regexps.py
index 52efd3e..3a777b8 100644
--- a/src/regexps.py
+++ b/src/regexps.py
@@ -46,7 +46,12 @@ re_decl    = re.compile( "".join( [ r"^\ *",
  r"|intrinsic *(::)?",
  r"|external *(::)?",
  r"|equivalence *(::)?",
+<<<<<<< Updated upstream
  r"|type ?\(",
+=======
+ r"|type *\(",
+ r"|type +",
+>>>>>>> Stashed changes
  r"|end ?type",
  r")[^=(]"
 ] ) )