add sessions
fix merge conflicts