add markdown tutorial
solve conflict