I’ve been facing the same problem with Plan Builder. It seems like removing events from the calendar before adding a new plan is the trick. Afterward, you can add the events back, and it should work fine. I’ll give it a try and see if it works for me too. Thanks for sharing your experiences