diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index ead5063..d57d7f1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -525,8 +525,13 @@
          Settings.System.RING_VIBRATION_INTENSITY more details on the constant values and
          meanings. -->
     <integer name="config_defaultRingVibrationIntensity">3</integer>
+<<<<<<< HEAD
     
      <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, andAdd commentMore actions
+
+    <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, and
+
+
          is not necessarily the same as the number of phones/logical modems supported by the device.
          For example, a multi-sim device can have 2 phones/logical modems, but 3 physical slots,
          or a single SIM device can have 1 phones/logical modems, but 2 physical slots (one eSIM
@@ -567,4 +572,10 @@
 
     <!-- Whether to enable fp unlock when screen turns off on udfps devices -->
     <bool name="config_screen_off_udfps_enabled">true</bool>
+=======
+
+    <!-- If not empty, sets the AVC codec profile level used for the internal screen recorder.
+         Possible values: 3, 3.1, 3.2, 4, 4.1, 4.2 -->
+    <string name="config_screenRecorderAVCProfileLevel" translatable="false">3.1</string>
+>>>>>>> 44bdb65 (spacewar: Fix screen record lag)
 </resources>
diff --git a/properties/vendor.prop b/properties/vendor.prop
index cd82199..17a40e9 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -195,6 +195,7 @@ ro.incremental.enable=yes
 
 # Media
 debug.stagefright.c2inputsurface=-1
+debug.sdm.support_writeback=0
 
 # Netflix
 vendor.netflix.bsp_rev=Q6450-36256-1