fixed cookies
merge resolved