diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp
index 8b8ea3eb7..61403cad0 100644
--- a/src/graphics/ui/elements/InventoryView.cpp
+++ b/src/graphics/ui/elements/InventoryView.cpp
@@ -366,7 +366,6 @@ void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
         );
         return;
     }
-<<<<<<< HEAD
     auto& indices = *content->getIndices();
     if (!layout.itemSource && stack.accepts(grabbed) && layout.placing) {
         auto& def = indices.items.require(stack.getItemId());
@@ -377,12 +376,6 @@ void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
             action = InteractionAction::TAKE;
             std::swap(grabbed, stack);
         }
-=======
-    auto indices = *content->getIndices();
-    if (!layout.itemSource && stack.accepts(grabbed) && layout.placing) {
-        action = InteractionAction::PUT;
-        stack.move(grabbed, indices);
->>>>>>> main
     } else {
         actIfCannotPut(stack, grabbed, action);
     }
@@ -399,21 +392,13 @@ void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
 
 void SlotView::actIfCannotPut(ItemStack& stack, ItemStack& grabbed, InteractionAction& action) {
     const auto& input = gui.getInput();
-<<<<<<< HEAD
     auto& indices = *content->getIndices();
-=======
-    auto indices = *content->getIndices();
->>>>>>> main
     if (layout.itemSource) {
         if (grabbed.isEmpty()) {
             action = InteractionAction::TAKE;
             grabbed.set(stack);
             if (input.pressed(Keycode::LEFT_CONTROL)) {
-<<<<<<< HEAD
                 grabbed.maximizeCount(indices);
-=======
-                grabbed.maximizeCount(*content->getIndices());
->>>>>>> main
             }
         } else {
             if (grabbed.accepts(stack)) {