fix session
fix conflict