Added in content and images to the pages and resolved conflicts