resolve conflictes in vote entity