update deps; also avoid sebastianbergmann/git#6
#6 begin calculations for merge