adding markdown support
Fixing merge conflict