solve git conflicts

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/res/values-night/colors.xml

@@ -20,6 +20,7 @@
     <color name="grey_200">#818181</color>
     <color name="nc_grey">#222222</color>
     <color name="icon_on_nc_grey">#ffffff</color>
+    <color name="foreground_highlight">#EAE0E5</color>
 
     <!-- Multiselect backgrounds -->
     <color name="action_mode_background">@color/appbar</color>

app/src/main/res/values/colors.xml

@@ -52,7 +52,7 @@
     <color name="secondary_button_text_color">#000000</color>
     <color name="nc_grey">#ededed</color>
     <color name="icon_on_nc_grey">#000000</color>
-
+    <color name="foreground_highlight">#1D1B1E</color>
     <color name="process_dialog_background">#ffffff</color>
     <color name="indicator_dot_selected">#ffffff</color>
     <color name="drawer_shadow">#000000</color>