Dependencies for resolve-trivial-conflicts-0.2

resolve-trivial-conflicts