New win lose merge

Should be good to go.