voting system added
fixed merging