Ability to end poll
Fixed merge issues