Reorganizing outlines
Fixing merge conflict