add session
order form paths
fix merge conflicts