From 8e63f9b32d2a0e36dcaa6a7c11c3bc60b28d8a7a Mon Sep 17 00:00:00 2001
From: Krasimir Angelov <kr.angelov@gmail.com>
Date: Sat, 25 Oct 2025 08:21:28 +0200
Subject: [PATCH] fix conflicts

---
 src/api/TryEus.gf | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/api/TryEus.gf b/src/api/TryEus.gf
index 0a0eec2e3..00d97ac3b 100644
--- a/src/api/TryEus.gf
+++ b/src/api/TryEus.gf
@@ -1,3 +1,16 @@
 --# -path=.:../basque:../common:../abstract:../prelude
 
-resource TryEus = SyntaxEus, LexiconEus, ParadigmsEus - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj] ;
+resource TryEus = SyntaxEus-[mkVoc], LexiconEus, ParadigmsEus - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj,mkVoc] **
+  open (P = ParadigmsEus) in {
+
+oper
+  mkAdv = overload SyntaxEus {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+  mkVoc = overload {
+    mkVoc : NP -> Voc = SyntaxEus.mkVoc ;
+    mkVoc : Str -> Voc = P.mkVoc ;
+  } ;
+
+}