fix missmerge