~/dev/creator/creator-3.2 on 3.2 % git status
On branch 3.2
Your branch is up-to-date with 'gerrit/3.2'.

You are currently cherry-picking commit c749d9b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   src/libs/3rdparty/cplusplus/AST.cpp
	...

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:      src/libs/3rdparty/cplusplus/Parser.cpp

~/dev/creator/creator-3.2 on 3.2 % git diff
diff --cc src/libs/3rdparty/cplusplus/Parser.cpp
index a8ee2d9,8ba38f5..0000000
--- a/src/libs/3rdparty/cplusplus/Parser.cpp
+++ b/src/libs/3rdparty/cplusplus/Parser.cpp
@@@ -261,11 -176,11 +262,18 @@@ Parser::Parser(TranslationUnit *unit
        _tokenIndex(1),
        _templateArguments(0),
        _inFunctionBody(false),
 -      _inObjCImplementationContext(false),
        _inExpressionStatement(false),
        _expressionDepth(0),
++<<<<<<< HEAD
 +      _statementDepth(0),
 +      _astCache(new ASTCache),
...