added logic to prototype winner
fixed merge conflicts