cookies message
Fixed none bug
fix
fixing merge