Removed all the text that was from a bad merge.