[fix] missed some conflicts :(