show poll form
resolve conflicts
add app title
resolve conflicts