we can now create polls!!
fixed conflicts