added logout
merge