diff --git a/GeneralMods/Revitalize/Framework/Hacks/ObjectInteractionHacks.cs b/GeneralMods/Revitalize/Framework/Hacks/ObjectInteractionHacks.cs
index 096a120c..f88e0218 100644
--- a/GeneralMods/Revitalize/Framework/Hacks/ObjectInteractionHacks.cs
+++ b/GeneralMods/Revitalize/Framework/Hacks/ObjectInteractionHacks.cs
@@ -4,12 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Xna.Framework;
-<<<<<<< HEAD
-//using Revitalize.Framework.Crafting;
 using Revitalize.Framework.Objects;
-=======
+
 using Revitalize.Framework.Crafting;
->>>>>>> parent of f3f4f4d... Fixed vanilla machines not rendering CustomObject(s) when finished producing.
 using Revitalize.Framework.Utilities;
 using StardewValley;
 using SObject = StardewValley.Object;
diff --git a/GeneralMods/Revitalize/ModCore.cs b/GeneralMods/Revitalize/ModCore.cs
index cd3ca908..a478d0c9 100644
--- a/GeneralMods/Revitalize/ModCore.cs
+++ b/GeneralMods/Revitalize/ModCore.cs
@@ -232,13 +232,10 @@ namespace Revitalize
             //ModHelper.Events.GameLoop.DayStarted += ObjectManager.resources.DailyResourceSpawn;
             //ModHelper.Events.Input.ButtonPressed += ObjectInteractionHacks.Input_CheckForObjectInteraction;
             ModHelper.Events.GameLoop.DayEnding += Serializer.DayEnding_CleanUpFilesForDeletion;
-<<<<<<< HEAD
             //ModHelper.Events.Display.RenderedWorld += ObjectInteractionHacks.Render_RenderCustomObjectsHeldInMachines;
             //ModHelper.Events.Multiplayer.PeerContextReceived += MultiplayerUtilities.OnPlayerConnect;
             //ModHelper.Events.Multiplayer.PeerDisconnected += MultiplayerUtilities.OnPlayerDisconnect;
             //ModHelper.Events.GameLoop.UpdateTicked += MultiplayerUtilities.GameLoop_OneSecondUpdateTicked;
-=======
->>>>>>> parent of f3f4f4d... Fixed vanilla machines not rendering CustomObject(s) when finished producing.
             //ModHelper.Events.Display.Rendered += MenuHacks.EndOfDay_OnMenuChanged;
             //ModHelper.Events.GameLoop.Saved += MenuHacks.EndOfDay_CleanupForNewDay;
             //ModHelper.Events.Multiplayer.ModMessageReceived += MultiplayerUtilities.ModMessageReceived;