[fix] fixed wrong merge