[tools] Fix wrong path in recreate_conflicts.php (aces#8292)

This fixes the wrong path in the require_once for recreate_conflict.
It also passes a missing LorisInstance object to the ConflictDetector
function.

Resolves aces#8063.

tools/recreate_conflicts.php

@@ -12,10 +12,10 @@
  * @link     https://www.github.com/aces/Loris/
  */
 
-require_once __DIR__ . 'generic_includes.php';
+require_once __DIR__ . '/generic_includes.php';
 
 $config = NDB_Config::singleton();
-$db     = Database::singleton();
+$db     = $lorisInstance->getDatabaseConnection();
 
 /**
  * HELP SCREEN
@@ -94,6 +94,7 @@
             print "Recreating conflicts for " . $instrument['Test_name'] .
                 ':'. $instrument['CommentID'] . "\n";
             $diff = ConflictDetector::detectConflictsForCommentIds(
+                $lorisInstance,
                 $instrument['Test_name'],
                 $instrument['CommentID'],
                 $instrument['DDECommentID']