interface:
  display_name: "Resolving Merge Conflicts"
  short_description: "Resolve merge and rebase conflicts"