fix code quote
fix quote to code quote.
fix conflict