diff --git a/Moose Development/Moose/Functional/Sead.lua b/Moose Development/Moose/Functional/Sead.lua
index be481e01d..03b8ea47b 100644
--- a/Moose Development/Moose/Functional/Sead.lua	
+++ b/Moose Development/Moose/Functional/Sead.lua	
@@ -16,15 +16,9 @@
 -- ===
 -- 
 -- ### Authors: **FlightControl**, **applevangelist**
-<<<<<<< Updated upstream
 -- 
--- Last Update: Feb 2021
--- 
-=======
---
 -- Last Update: April 2021
 --
->>>>>>> Stashed changes
 -- ===
 -- 
 -- @module Functional.Sead