_config.yml, run rebase to merge markdown_parser
fix conflict