In Ruby 3.0, positional arguments and keyword arguments will be
separated. In Ruby 2.7, deprecation warnings related to keyword
arguments show up.

Pass the arguments as keyword arguments since `#resolve_conflicts`
expect keyword arguments.