deleted the <<<<<<<<HEAD and other errors in History