A simple markdown example
Resolved conflicts in readme