diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index 35bf77d..f390697 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -21,6 +21,7 @@ Version=9.85
 #End Region
 
 
+<<<<<<< HEAD
 
 
 'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
@@ -33,6 +34,8 @@ Version=9.85
 
 
 
+=======
+>>>>>>> a30093ba05c3ba171d9ac3b4164b9ca5f7234d86
 Sub Class_Globals
 	Private Root As B4XView
 	Private xui As XUI
diff --git a/B4A/KelloggsV3.b4a.meta b/B4A/KelloggsV3.b4a.meta
index 48412b0..b9dee63 100644
--- a/B4A/KelloggsV3.b4a.meta
+++ b/B4A/KelloggsV3.b4a.meta
@@ -82,6 +82,10 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
+<<<<<<< HEAD
 NavigationStack=C_NoVenta,Class_Globals,0,0,C_Clientes,Class_Globals,0,0,C_Nota,ListView1_ItemLongClick,320,0,C_Nota,b_desc_Click,353,0,C_Cliente,Class_Globals,290,6,C_Cliente,B4XPage_Appear,428,6,C_Cliente,B_IMP2_Click,1295,6,C_Nota,Class_Globals,34,0,C_Nota,B4XPage_Appear,179,0,C_TicketsDia,Class_Globals,8,0,C_TicketsDia,B4XPage_Appear,70,2
+=======
+NavigationStack=C_Cliente,Mods,0,0,C_Cliente,Class_Globals,290,0,C_Cliente,B4XPage_Appear,429,0,C_Cliente,B_IMP2_Click,1297,0,C_Nota,Class_Globals,34,0,C_Nota,B4XPage_Appear,179,0,C_TicketsDia,Class_Globals,8,0,C_TicketsDia,B4XPage_Appear,69,2
+>>>>>>> a30093ba05c3ba171d9ac3b4164b9ca5f7234d86
 SelectedBuild=0
 VisibleModules=1,2,3,4,5,6,7,8,9,10,14,11