fixed session bug casued by confilct