Reapply POK customization losts with wrong merge