Added ring election
Merge