conflicts fixed and merged: sessions-events