Add session
fix conflicts in heder