Trying to resolve merge conflicts that git thinks exist.
Trying to resolve merge conflicts that git thinks exist.

concord-consortium/rigse,concord-consortium/rigse,concord-consortium/rigse,concord-consortium/rigse,concord-consortium/rigse,concord-consortium/rigse