diff --git a/Build/Build.fbp5 b/Build/Build.fbp5
index defe384e..ba0168c7 100644
--- a/Build/Build.fbp5
+++ b/Build/Build.fbp5
@@ -2968,13 +2968,8 @@ Comments=
                 <Property MultiValue="0" name="ActionDescription" type="string">Contactos</Property>
                 <Property name="ActionTextColor" type="Cardinal">0</Property>
                 <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
-<<<<<<< .mine
                 <Property MultiValue="0" name="Description" type="string">Contactos</Property>
                 <Property name="Enabled" type="WordBool">True</Property>
-=======
-                <Property MultiValue="0" name="Description" type="string">Contactos</Property>
-                <Property name="Enabled" type="WordBool">False</Property>
->>>>>>> .r42
                 <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
                 <Property name="IgnoreFailure" type="WordBool">False</Property>
                 <Property name="IsAction" type="Boolean">True</Property>