Now episodes can be deleted from the activity form
.
Merge and conflict resolve