Fixed voting
Fixed spacing to 2 spaces
fixed conflicts
fixed typos
merge conflict spaces