PLD: fix rebase issues