a repo with conflicts when trying to merge a branch back into the trunk