added more content
fixed merge conflicts