[fix] PlongeeBDD: fix bad rebase