fix markdown output
conflict