Working on merge conflict with LongPoll
Fix merge