refactor to allow changing our nick after nick conflict but first #967 needs to be fixed so I can test