session is now sent to local
merged changes
merged changes