diff --git a/rtdata/languages/default b/rtdata/languages/default
index c43e895bb..7179e75f4 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1196,7 +1196,6 @@ HISTORY_MSG_BLSHAPE;Blur by level
 HISTORY_MSG_BLURCWAV;Blur chroma
 HISTORY_MSG_BLURWAV;Blur luminance
 HISTORY_MSG_BLUWAV;Attenuation Response
->>>>>>> dev
 HISTORY_MSG_CAT02PRESET;Cat02 automatic preset
 HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction