Removed files associated with earlier merge error.