Patched up the rest of the file from the merge