added alert to poll
fixed merge conflict