e book section
resolved conflicts