add markdown mode
add markdown mode and resolve conflict