Fixed cookie merge issues