diff --git a/HISTORY b/HISTORY
index fc8dfce..2bc6546 100644
--- a/HISTORY
+++ b/HISTORY
@@ -228,13 +228,11 @@ Version 0.3.1
 
 Version 0.3.2
 
-<<<<<<< HEAD
 - fixed crash in drawing devices
-=======
 - fixed crash if number of dvb devices changes
 - added possibility to detach dedicated viewelements in displaychannel
   and displaymenumain that they start in an own thread
 - introduced background="true" attribute in viewelements. These areas
   will only be drawn once.
->>>>>>> multithread
+- fixed bug in creating osd
 
diff --git a/libcore/pixmapcontainer.c b/libcore/pixmapcontainer.c
index 94fe3eb..66f0e58 100644
--- a/libcore/pixmapcontainer.c
+++ b/libcore/pixmapcontainer.c
@@ -52,7 +52,7 @@ bool cPixmapContainer::CreateOsd(int Left, int Top, int Width, int Height) {
     }
     cOsd *newOsd = cOsdProvider::NewOsd(Left, Top);
     if (newOsd) {
-        tArea Area = { 0, 0, Width, Height,  32 };
+        tArea Area = { 0, 0, Width - 1, Height - 1,  32 };
         if (newOsd->SetAreas(&Area, 1) == oeOk) {
             osd = newOsd;
             return true;