fix markdown of note
fix conflict