user.server conflict resolved