edit session
conflict fixed