Fix remaining errors due to merge conflicts, check if joining localhost and same port as myself to determine if I should start new Chord ring