login conflict resolve