Fixed cookie collision
Fixed Conflicts