add chapters working
fixed merge conflicts