diff --git a/ChangeLog b/ChangeLog
index 27cc25bf1..30aed43f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 	First version of stylable knobs. Perhaps can be overlayed with current
 	knobs to add line coloring/width in other places around the GUI.
 
+	* plugins/patman/artwork.png:
+	Fixed artwork again
+
 2008-05-18	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/stk/mallets/mallets.cpp:
@@ -65,7 +68,6 @@
 	protect individual buffers of FX-channels from being processed by more
 	than one thread
 
->>>>>>> .r985
 2008-05-17  Paul Giblock	<drfaygo/at/gmail/dot/com>
 
 	* plugins/stereo_matrix/stereomatrix_controls.cpp:
diff --git a/plugins/patman/artwork.png b/plugins/patman/artwork.png
index cd9cf6ba9..8d521a29b 100644
Binary files a/plugins/patman/artwork.png and b/plugins/patman/artwork.png differ