Fixed merge conflicts

Author: mudiagaobrikisil

tests/SIL.Machine.Tests/Corpora/ParallelTextCorpusTests.cs

@@ -1,7 +1,6 @@
 using System.Text.Json;
 using NUnit.Framework;
 using NUnit.Framework.Internal;
-using NUnit.Framework.Internal;
 using SIL.Scripture;
 using SIL.Scripture.Extensions;