Some minor conflict resolution, Gitaly changes are again orthogonal to Heptapod, 207 non-merge commits