YIP-6: Proposal Conflict Resolution

I, Brock Elmore, propose the following:

Item 1: Conflicting Proposal With Same End Time goes to affirmative vote count

If two proposals that conflict with each other have the same end date, and both pass and reach quorum, the winner shall be decided by the proposal that has the greater number of votes in the affirmative.

Item 2: Furthermore, in the case of same affirmative vote count, both proposals are invalid

If two proposals that conflict with each other have the same end date, and both pass, reach quorum, and have the same number of affirmative votes, both proposals are considered inv…