fixed issue 9 and not done issue10 conflict session