feat(highlights): add support for `conflict-marker.nvim`#117

cpea2506 merged 1 commit intomaincpea2506/one_monokai.nvim:mainfrom

feat/conflict-markerscpea2506/one_monokai.nvim:feat/conflict-markersCopy head branch name to clipboard