Commit test
Resolved conflicts in guide_index.