ch2 updates
resolving merge issue
adding conclusion to ch1