diff --git a/src/l10n/fixtures/nl.yaml b/src/l10n/fixtures/nl.yaml
index e1731e3..ad417e6 100644
--- a/src/l10n/fixtures/nl.yaml
+++ b/src/l10n/fixtures/nl.yaml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 "Custom menu": "Custom menu"
 "Enable the custom menu": "Enable the custom menu"
 "No": "No"
@@ -91,97 +90,3 @@
 "Applications kept in the top menu": "Applications kept in the top menu"
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
-=======
-"Custom menu": ""
-"Enable the custom menu": ""
-"No": ""
-"Yes": ""
-"Menu": ""
-? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
-: ''
-"Top menu": ""
-"Apps that not must be moved in the side menu": ""
-"If there is no selection then the global configuration is applied.": ""
-"Experimental": ""
-"Save": ""
-"You like this app and you want to support me?": ""
-"Buy me a coffee ☕": ""
-"Hidden": ""
-"Small": ""
-"Normal": ""
-"Big": ""
-"Hidden icon": ""
-"Small icon": ""
-"Normal icon": ""
-"Big icon": ""
-"Hidden text": ""
-"Small text": ""
-"Normal text": ""
-"Big text": ""
-"Colors": ""
-"Background color": ""
-"Background color of current app": ""
-"Text color": ""
-"Loader": ""
-"Icon": ""
-"Same color": ""
-"Opposite color": ""
-"Transparent": ""
-"Opaque": ""
-"Opener": ""
-"Default": ""
-"Default (dark)": ""
-"Hamburger": ""
-"Hamburger (dark)": ""
-"Hamburger 2": ""
-"Hamburger 2 (dark)": ""
-"Before the logo": ""
-"After the logo": ""
-"Position": ""
-"Show only the opener (hidden logo)": ""
-"Do not display the side menu and the opener if there is no application (eg: public pages).": ""
-"Panel": ""
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": ""
-"Display the big menu": ""
-"Display the logo": ""
-"Icons and texts": ""
-"Loader enabled": ""
-"Tips": ""
-"Always displayed": ""
-"This is the automatic behavior when the menu is always displayed.": ""
-"Not compatible with touch screens.": ""
-"Big menu": ""
-"Live preview": ""
-"Open apps in new tab": ""
-"Use the global setting": ""
-"Use my selection": ""
-"Show and hide the list of applications": ""
-"Use the avatar instead of the logo": ""
-"You do not have permission to change the settings.": ""
-"Force this configuration to users": ""
-"Export the configuration": ""
-"Purge the cache": ""
-"Show the link to settings": ""
-"The menu is enabled by default for users": ""
-"Except when the configuration is forced.": ""
-"Apps that should not be displayed in the menu": ""
-"This feature is only compatible with the <code>big menu</code> display.": ""
-"The logo is a link to the default app": ""
-"Others": ""
-"Categories": ""
-"Customize sorting": ""
-"Order by": ""
-"Name": ""
-"Customed": ""
-"Show and hide the list of categories": ""
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": ""
-"Dark mode colors": ""
-"With categories": ""
-"Custom categories": ""
-"Customize application categories": ""
-"Reset to default": ""
-"Applications": ""
-"Applications kept in the top menu": ""
-"Applications kept in the top menu but also shown in side menu": ""
-"These applications must be selected in the previous option.": ""
->>>>>>> 7bbed57 (Added translation using Weblate (Dutch))