Initial sessions setup
fix merge conflicts