diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42a65ad11..9a983407f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,9 @@
 # Refined Storage Changelog
 
-<<<<<<< HEAD
 ### 1.6.4
 - Rewrote autocrafting again (raoulvdberge)
 - Reworked the Crafting Monitor (raoulvdberge)
-- Optimized image sizes and improved image compression (samtrion)
 
-=======
->>>>>>> parent of fea420aa... Image sizes optimized (#1944)
 ### 1.6.3
 - Fixed crash with Wireless Fluid Grid (raoulvdberge)
 - Fixed Reborn Storage crafting being slower than normal (raoulvdberge)
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png
deleted file mode 100755
index 4c4a2379f..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png
index 29227bc9b..eda64fa1c 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png and b/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png differ