Resolved content.md conflict

between current and master branches