diff --git a/server/validation/user.go b/server/validation/user.go
index 9cbac87..1aa8a4c 100644
--- a/server/validation/user.go
+++ b/server/validation/user.go
@@ -1,18 +1,10 @@
 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 {
@@ -64,10 +56,10 @@ func ValidatePassword(user *viewmodel.User) []errors.ValidationError {
 	}
 
 	if !containsUpperCaseLetter || !containsLowerCaseLetter || !containsNumber {
-		result = append(result, errors.ValidationError{Field : "password", Message : "Password must contain one of EACH :"})
-		result = append(result, errors.ValidationError{Field : "password-tab", Message : "an uppercase letter"})
-		result = append(result, errors.ValidationError{Field : "password-tab", Message : "a lowercase letter"})
-		result = append(result, errors.ValidationError{Field : "password-tab", Message : "a number"})
+		result = append(result, errors.ValidationError{Field: "password", Message: "Password must contain one of EACH :"})
+		result = append(result, errors.ValidationError{Field: "password-tab", Message: "an uppercase letter"})
+		result = append(result, errors.ValidationError{Field: "password-tab", Message: "a lowercase letter"})
+		result = append(result, errors.ValidationError{Field: "password-tab", Message: "a number"})
 	}
 
 	return result