stickynote
merge fixed