Resolved merge conflicts + Voting