sessions controller prepull
fix merge conflict in sessions controller