[fix] merge issue