diff --git a/server/validation/user.go b/server/validation/user.go
index 1aa8a4c..131d2ea 100644
--- a/server/validation/user.go
+++ b/server/validation/user.go
@@ -1,10 +1,18 @@
 package validation
 
 import (
+<<<<<<< HEAD
+=======
+
+>>>>>>> enforce password policy
 	"strings"
 
 	"bitbucket.org/nemt/nemt-portal-api/application/viewmodel"
 	"bitbucket.org/nemt/nemt-portal-api/infra/errors"
+<<<<<<< HEAD
+=======
+
+>>>>>>> enforce password policy
 )
 
 func characterIsUpperCase(character rune) bool {