repo_fix_conflicts
s->conflicts = repo_fix_conflicts(s->repo, s->conflicts);
extern Offset repo_fix_conflicts(Repo *repo, Offset conflicts);