fix cookieOptions merge conflict
fix cookieOptions merge conflict

k88hudson/newww,dannycoates/newww,n1889/newww,jonathanmarvens/npm-newww,supriyantomaftuh/newww,pombredanne/newww,mikaelbr/newww,ericdouglas/newww,RichardLitt/newww,psalaets/newww,supriyantomaftuh/newww,psalaets/newww,RichardLitt/newww,joeybaker/newww,marcellodesales/newww,balupton/newww,watilde/newww,alexindigo/newww,ChALkeR/newww,zeusdeux/newww,k88hudson/newww,dancrumb/newww,tiandavis/newww,aks-/newww,watilde/newww,marcellodesales/newww,sub2u/newww,geek/newww,dancrumb/newww,kemitchell/newww,nexdrew/newww,imshivs/newww,ChALkeR/newww,n1889/newww,nexdrew/newww,k88hudson/newww,geek/newww,amilaonbitlab/newww,whitneyit/newww,rwaldron/newww,jonathanmarvens/npm-newww,marcellodesales/newww,mehrdadrafiee/newww,rwaldron/newww,AgtLucas/newww,kemitchell/newww,rutaihwa/newww,n1889/newww,seldo/newww,AgtLucas/newww,tiandavis/newww,psalaets/newww,pombredanne/newww,ChALkeR/newww,sub2u/newww,seldo/newww,aredridel/newww,sub2u/newww,DanielBarnes/newww,zeusdeux/newww,joeybaker/newww,aredridel/newww,amilaonbitlab/newww,imshivs/newww,kemitchell/newww,seldo/newww,watilde/newww,dannycoates/newww,DanielBarnes/newww,nexdrew/newww,Constructor-io/newww,aks-/newww,mikaelbr/newww,aredridel/newww,whitneyit/newww,amilaonbitlab/newww,geek/newww,alexindigo/newww,mehrdadrafiee/newww,imshivs/newww,DanielBarnes/newww,jonathanmarvens/npm-newww,whitneyit/newww,tiandavis/newww,rutaihwa/newww,balupton/newww,ericdouglas/newww,dancrumb/newww,Constructor-io/newww,AgtLucas/newww,pombredanne/newww,supriyantomaftuh/newww,Constructor-io/newww,zeusdeux/newww,aks-/newww,rutaihwa/newww