diff --git a/conflict/conflict.go b/conflict/conflict.go
index f820640..2952e2b 100644
--- a/conflict/conflict.go
+++ b/conflict/conflict.go
@@ -4,7 +4,7 @@ import (
 	"github.com/mkchoi212/fac/color"
 )
 
-// Conflict represents a single conflict that may have occured
+// Conflict represents a single conflict that may have occurred
 type Conflict struct {
 	Choice       int
 	FileName     string