removed cookies
merge