Dependencies for resolve-trivial-conflicts-0.3

resolve-trivial-conflicts