conflict in logout resolved