Streamlined basis expansion chapter.
Fixed conflict.