resolve session clearing issue
merge conflict voters