Fix nickname change conflicts

fixes #242