fix merge

Author: MarcaDian

patches/src/main/kotlin/app/revanced/patches/youtube/misc/hapticfeedback/DisableHapticFeedbackPatch.kt renamed to patches/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/DisableHapticFeedbackPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.hapticfeedback
+package app.revanced.patches.youtube.player.hapticfeedback
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -37,7 +37,7 @@ val disableHapticFeedbackPatch = bytecodePatch(
     )
 
     execute {
-        addResources("youtube", "misc.hapticfeedback.disableHapticFeedbackPatch")
+        addResources("youtube", "player.hapticfeedback.disableHapticFeedbackPatch")
 
         PreferenceScreen.PLAYER.addPreferences(
             PreferenceScreenPreference(

patches/src/main/kotlin/app/revanced/patches/youtube/misc/hapticfeedback/Fingerprints.kt renamed to patches/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/Fingerprints.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.hapticfeedback
+package app.revanced.patches.youtube.player.hapticfeedback
 
 import app.revanced.patcher.fingerprint
 

patches/src/main/kotlin/app/revanced/patches/youtube/player/zoomhaptics/ZoomHapticsPatch.kt

@@ -1,11 +1,11 @@
-package app.revanced.patches.youtube.misc.zoomhaptics
+package app.revanced.patches.youtube.player.zoomhaptics
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.youtube.misc.hapticfeedback.disableHapticFeedbackPatch
+import app.revanced.patches.youtube.player.hapticfeedback.disableHapticFeedbackPatch
 
 @Deprecated("Superseded by disableHapticFeedbackPatch", ReplaceWith("disableHapticFeedbackPatch"))
 val zoomHapticsPatch = bytecodePatch(
     description = "Adds an option to disable haptics when zooming.",
 ) {
     dependsOn(disableHapticFeedbackPatch)
-}
+}