Fixed voting
Fixed spacing to 2 spaces
fixed conflicts