Try to solve simple conflicts

[krystof-k]

PR Merger is failing in cases where every PR is making a change in the same file, e.g. changelog, Gemfile or components export (that's our case in React repo).

It'd be great if it tries to solve those, probably addition-only conflicts, and therefore merge even branches with conflicting files

Possibly a union merge could be used for this.