```coffeescript
# See https://atom.io/docs/latest/creating-a-package#menus for more details
'context-menu':
  '.overlayer':
      'Enable merge-conflicts': 'merge-conflicts:toggle'

'menu': [
  {
    'label': 'Packages'
    'submenu': [
      'label': 'merge-conflicts'
      'submenu': [
        { 'label': 'Toggle', 'command': 'merge-conflicts:toggle' }
      ]
    ]
  }
]
```

Add Resolve: entries to the context menu.
user
```coffeescript
# See https://atom.io/docs/latest/creating-a-package#menus for more details
'context-menu':
  '.conflicted':
    'Resolve: Current': 'merge-conflicts:accept-current'
    'Resolve: Ours': 'merge-conflicts:accept-ours'
    'Resolve: Theirs': 'merge-conflicts:accept-theirs'
    'Resolve: Ours Then Theirs': 'merge-conflicts:ours-then-theirs'
    'Resolve: Theirs Then Ours': 'merge-conflicts:theirs-then-ours'

'menu': [
  {
    'label': 'Packages'
    'submenu': [
      'label': 'Merge Conflicts'
      'submenu': [
        { 'label': 'Detect', 'command': 'merge-conflicts:detect' }
      ]
    ]
  }
]
```
assistant