diff --git a/src/pages/views/teamsbot/TeamsbotSettingsView.tsx b/src/pages/views/teamsbot/TeamsbotSettingsView.tsx
index d797ebd..c706716 100644
--- a/src/pages/views/teamsbot/TeamsbotSettingsView.tsx
+++ b/src/pages/views/teamsbot/TeamsbotSettingsView.tsx
@@ -11,11 +11,7 @@ export const TeamsbotSettingsView: React.FC = () => {
   const { instance } = useCurrentInstance();
   const instanceId = instance?.id || '';
 
-<<<<<<< feat/auxiliaries2
   const [_config, setConfig] = useState<TeamsbotConfig | null>(null);
-=======
-  const [, setConfig] = useState<TeamsbotConfig | null>(null);
->>>>>>> int
   const [loading, setLoading] = useState(true);
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState<string | null>(null);