fixed markdown conflict bug