Restore Drafts compatibility after unsuccessful merge