Resolving conflict seed file.