diff --git a/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs b/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
index c6245f1a5d..adea1fd748 100644
--- a/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
+++ b/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
@@ -58,7 +58,7 @@ public void VerifyAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileV
         }
 
         var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile), attribute);
-        Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes with conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
+        Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
     }
 
     [Test]
diff --git a/src/GitVersionTask/InvalidFileChecker.cs b/src/GitVersionTask/InvalidFileChecker.cs
index f12ddd8421..669a87da0c 100644
--- a/src/GitVersionTask/InvalidFileChecker.cs
+++ b/src/GitVersionTask/InvalidFileChecker.cs
@@ -18,7 +18,7 @@ public static void CheckForInvalidFiles(IEnumerable<ITaskItem> compileFiles, str
     {
         foreach (var compileFile in GetInvalidFiles(compileFiles, projectFile))
         {
-            throw new WarningException("File contains assembly version attributes with conflict with the attributes generated by GitVersion " + compileFile);
+            throw new WarningException("File contains assembly version attributes which conflict with the attributes generated by GitVersion " + compileFile);
         }
     }