okayzed
commented
6 years ago I'm not really understanding what is going on with the merge here. I resolved the conflicts locally, then I hit another set of merge conflicts. It seems like there are 3 or more conflicting commits when I rebase off master.
I spent part of yesterday re-validating the code in this commit (looks reasonable) and testing it on the snorkel grpc branch. I'm ready to merge it in as soon as we can make it past the conflicts
originally from #42