merging in sessions changes