1 files changed, 15 insertions, 6 deletions
diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt
index e1bf892c7..55ae8b5e6 100644
--- a/src/math/gfpmath/info.txt
+++ b/src/math/gfpmath/info.txt
@@ -1,16 +1,25 @@
 define BIGINT_GFP
 
-load_on auto
+<header:public>
+curve_gfp.h
+gfp_element.h
+gfp_modulus.h
+point_gfp.h
+</header:public>
 
+<<<<<<< variant A
+<source>
+>>>>>>> variant B
 <add>
+####### Ancestor
+define BIGINT_GFP
+
+<add>
+======= end
 curve_gfp.cpp
-curve_gfp.h
 gfp_element.cpp
-gfp_element.h
-gfp_modulus.h
 point_gfp.cpp
-point_gfp.h
-</add>
+</source>
 
 <requires>
 bigint