diff --git a/changelog b/changelog
index a8ce84de8..2d60a4c6d 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 ## Changed
 * The wood-burning generator now burns 40mB/s instead of 1mB/s
 * Buffed the wood-burning generator's efficiency for fluids from 25% to 50%
@@ -7,5 +6,3 @@
 ## Fixed
 * Fixed wood-burning generator being 100x more efficient than it's supposed to be
 * Fixed arc welders eating infinite energy
-=======
->>>>>>> Stashed changes