WIP: real time markdown processing
Fix conflicts