diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw540dp/config.xml
index 43e176e..15fc5bf 100644
--- a/java/res/values-sw540dp/config.xml
+++ b/java/res/values-sw540dp/config.xml
@@ -23,7 +23,11 @@
     <bool name="config_enable_bigram_suggestions_option">false</bool>
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_key_preview_popup">false</bool>
+<<<<<<< HEAD
     <bool name="config_default_sound_enabled">false</bool>
+=======
+    <bool name="config_default_sound_enabled">true</bool>
+>>>>>>> android-4.4.2_r1
     <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
     <!-- The language is never displayed if == 0, always displayed if < 0 -->
     <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index ae27906..51029f0 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -24,7 +24,11 @@
     <bool name="config_enable_bigram_suggestions_option">false</bool>
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_key_preview_popup">false</bool>
+<<<<<<< HEAD
     <bool name="config_default_sound_enabled">false</bool>
+=======
+    <bool name="config_default_sound_enabled">true</bool>
+>>>>>>> android-4.4.2_r1
     <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
     <integer name="config_max_more_keys_column">5</integer>
     <!--