Fixed files that were corrupted in the merge.