Undossing all of these files.  Oh I hope Morgan is not too frustrated with merge conflicts