Make conflict marker search more specific
Make conflict marker search more specific

This avoids matching of arbitrary "========" marker strings in source
code

kaihowl/dotfiles,kaihowl/dotfiles,kaihowl/dotfiles,kaihowl/dotfiles,kaihowl/dotfiles