Original: This mammoth project involved re-building the nave, whose walls incorporate some of the earlier church and the restoration of the choir.
Simplified: This mammoth project involved re-building the nave, whose walls include some of the earlier church.