ocrdata.txt happy face
merge errors