Updates to content pages
Resovling a conflict