diff --git a/.gitignore b/.gitignore
index a762830..5fff1d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
-pkg/
-=======
 pkg
->>>>>>> adding License information and go format
diff --git a/ntlm/ntlmv1_test.go b/ntlm/ntlmv1_test.go
index 5e27d1d..eaa6331 100644
--- a/ntlm/ntlmv1_test.go
+++ b/ntlm/ntlmv1_test.go
@@ -62,7 +62,7 @@ func TestNtlmV1ExtendedSessionSecurity(t *testing.T) {
 	context.SetServerChallenge(c.ServerChallenge)
 	err = context.ProcessAuthenticateMessage(msg)
 	if err == nil {
-		t.Errorf("This message should have failed to authenticate, but it passed")
+		t.Error("This message should have failed to authenticate, but it passed")
 	}
 }