Create polls edit
Merge conflict