git: branches/pull diverged; how to proceed?

Your branch and 'origin/develop' have diverged,
and have 34 and 12 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
    modified:   Project/Config.swift
    modified:   Podfile.lock
...

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   Project.xcodeproj/project.pbxproj
    both modified:   Project/Scene/Posting/PostingScene.storyboard
...

Untracked files:
  (use "git add <file>..." to include in what will be committed)
    .gitallowed

https://stackoverflow.com/questions/8716130/git-branches-diverged-how-to-proceed