diff --git a/lib/addCam/add_cam_main.dart b/lib/addCam/add_cam_main.dart
index 7d65d37..f3b72ac 100644
--- a/lib/addCam/add_cam_main.dart
+++ b/lib/addCam/add_cam_main.dart
@@ -256,10 +256,6 @@ class _AddCamMainState extends State<AddCamMain> {
                   child: Text(AppLocalizations.of(context)!.template)),
               TextButton(
                   onPressed: () async {
-<<<<<<< HEAD
-                    saveData();
-=======
->>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
                     _httpRequest();
                     saveData();
                     Navigator.pushNamedAndRemoveUntil(
diff --git a/lib/addCam/cam_widgets.dart b/lib/addCam/cam_widgets.dart
index 6a31136..3a37bad 100644
--- a/lib/addCam/cam_widgets.dart
+++ b/lib/addCam/cam_widgets.dart
@@ -2417,101 +2417,6 @@ class _FKontakt3State extends State<FKontakt3> {
       );
 }
 
-<<<<<<< HEAD
-=======
-// Standort
-
-class Standort extends StatefulWidget {
-  final TextEditingController standortC;
-
-  const Standort({super.key, required this.standortC});
-
-  @override
-  State<Standort> createState() => _StandortState();
-}
-
-class _StandortState extends State<Standort> {
-  String? selectedRudel;
-  late Future<List<Map<String, dynamic>>> Standort;
-
-  @override
-  void initState() {
-    super.initState();
-    Standort = DBHelper().getPlace();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      children: [
-        Expanded(
-            flex: 3,
-            child: TextField(
-              keyboardType: TextInputType.multiline,
-              maxLines: null,
-              decoration: InputDecoration(
-                hintText: AppLocalizations.of(context)!.altstort,
-                enabledBorder: widget.standortC.text.isEmpty
-                    ? const UnderlineInputBorder(
-                        borderSide: BorderSide(color: Colors.red))
-                    : const UnderlineInputBorder(
-                        borderSide: BorderSide(color: Colors.green)),
-                focusedBorder: widget.standortC.text.isEmpty
-                    ? const UnderlineInputBorder(
-                        borderSide: BorderSide(color: Colors.red))
-                    : const UnderlineInputBorder(
-                        borderSide: BorderSide(color: Colors.green)),
-              ),
-              controller: widget.standortC,
-            )),
-        Expanded(
-          flex: 1,
-          child: Align(
-            alignment: Alignment.bottomLeft,
-            child: FutureBuilder<List<Map<String, dynamic>>>(
-              future: Standort,
-              builder: (BuildContext context,
-                  AsyncSnapshot<List<Map<String, dynamic>>> snapshot) {
-                if (snapshot.hasData) {
-                  var filteredData = snapshot.data!
-                      .where((item) => item['Standort'] != null)
-                      .toList();
-                  return DropdownButton<String>(
-                    items: filteredData
-                        .map((item) =>
-                            buildMenuItem(item['Standort'].toString()))
-                        .toList(),
-                    onChanged: (value) {
-                      setState(
-                        () {
-                          selectedRudel = value;
-                          widget.standortC.text = value ?? '';
-                        },
-                      );
-                    },
-                    value: null,
-                    underline: const SizedBox(),
-                  );
-                } else if (snapshot.hasError) {
-                  return Text('Fehler: ${snapshot.error}');
-                } else {
-                  return const CircularProgressIndicator();
-                }
-              },
-            ),
-          ),
-        )
-      ],
-    );
-  }
-
-  DropdownMenuItem<String> buildMenuItem(String item) => DropdownMenuItem(
-        value: item,
-        child: Text(item),
-      );
-}
-
->>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
 // KTage1
 
 class KTage1 extends StatefulWidget {
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index e8d2840..7638280 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -85,11 +85,8 @@
     "open": "öffnen",
     "date": "Datum",
     "location": "Standort",
-<<<<<<< HEAD
     "sendfile": "Datei zum Server schicken",
-    "pickfile": "Datei auswählen"
-=======
+    "pickfile": "Datei auswählen",
     "placedata": "Standortdaten",
     "sent": "Gesendet"
->>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
 }
\ No newline at end of file
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 9829647..fa15049 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -409,7 +409,6 @@
         "description": "Location text"
     },
 
-<<<<<<< HEAD
     "sendfile": "Send file to server",
     "@sendfile": {
         "description": "Send file to server button"
@@ -418,7 +417,8 @@
     "pickfile": "Pick file",
     "@pickfile": {
         "description": "Pick file button"
-=======
+    },
+    
     "placedata": "Placedata",
     "@camdata": {
         "description": "view data placedata header"
@@ -427,7 +427,6 @@
     "sent": "Sent",
     "@sent": {
         "description": "view data sent header"
->>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
     }
 
 }
\ No newline at end of file