small changes
conflict fixed
intro changes
resolved conflicts
merged versions
minor section 1 changes