The 2nd edition merged its ideas with which two forms of thought