Reverted to original file before merging

Merging our files had errors.