Fixing Merge Errors

This change fixes the errors produced by my successful attempt at fixing
local errors.
Another version of output.pkl