Forms editor’s draft -> draft
Resolve conflict