contents
conflicts resolved
added content
new pages added