Resolve merge conflict

Signed-off-by: Herb Sutter <[email protected]>

Author: hsutter

source/parse.h

@@ -2598,6 +2598,9 @@ struct declaration_node
     auto is_alias() const -> bool
         { return type.index() == an_alias;    }
 
+    auto is_function_expression () const -> bool
+        { return is_function() && !identifier;  }
+
     auto is_template() const -> bool
         { return template_parameters != nullptr; }