upvoting done
conflict issues