fix: fix duplicate
Merge branch 'freeze' into develop