Do the terms of a will supersede terms from a previously created trust?

I live in California. My grandfather formed a trust with my grandmother before she died. After she died, he made a will, stipulating some terms that contradicted the trust, and some terms that were new altogether. Are we legally bound to follow the terms of the trust, or of the subsequently created will?