better session conflict handling