votes in order
resolved conflicts in project controller