adding markdown mode
resolve a conflict