Merged content and updated policy doc