add cookie conflict detection