Fixing Merge Issues

Reinstating clobbered files.