[fix] typo during merge fixing