The war of geology is over–but only sort of