content fixes
merge conflict resolved