From 96bdaf93b9906f1eb910c971a8b52d8eeac28201 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:33:42 -0400
Subject: [PATCH] powder that makes you say yes

---
 tgui/packages/tgui/interfaces/VorePanel.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js
index 3afa4bab16..78f100229f 100644
--- a/tgui/packages/tgui/interfaces/VorePanel.js
+++ b/tgui/packages/tgui/interfaces/VorePanel.js
@@ -1777,7 +1777,9 @@ const VoreUserPreferences = (props, context) => {
           <VoreUserPreferenceItem spec={preferences.spontaneous_tf} />
         </Flex.Item>
         <Flex.Item basis="32%">
-<<<<<<< HEAD
+          <Button fluid content="Slective Mode Preference" onClick={() => act('switch_selective_mode_pref')} />
+        </Flex.Item>
+        <Flex.Item basis="32%">
           <VoreUserPreferenceItem spec={preferences.autotransferable} />
         </Flex.Item>
         <Flex.Item basis="49%">
@@ -1785,9 +1787,6 @@ const VoreUserPreferences = (props, context) => {
         </Flex.Item>
         <Flex.Item basis="49%">
           <VoreUserPreferenceItem spec={preferences.liquid_give} tooltipPosition="top" />
-=======
-          <Button fluid content="Slective Mode Preference" onClick={() => act('switch_selective_mode_pref')} />
->>>>>>> 7550df1e26... Merge pull request #13406 from Heroman3003/selective-upgrade
         </Flex.Item>
       </Flex>
       <Section title="Aesthetic Preferences">