Dependencies for resolve-trivial-conflicts-0.3.1

resolve-trivial-conflicts