72 chars on basics doc
fix small merge conflict