- Added second section
- Conflicts solved