fix mismerged version