merge conflicts
adjust how we select peers