Error: Auto-merging test/src/test-cppapi-aggregates.cc CONFLICT (content): Merge conflict in test/src/test-cppapi-aggregates.cc error: could not apply 86b61b8f1... Aggregates pushdown: adding incomplete tests. (#4301) hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort".