Update conventions.markdown