oops, i borked git by merging with my own merge. trying to fix.