fix changelof merge error