fix conflicts

server/signserver/dbutils.go

@@ -12,7 +12,7 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-func (s *Server) newUserChara(uid int) error {
+func (s *Server) newUserChara(uid uint32) error {
 	var numNewChars int
 	err := s.db.QueryRow("SELECT COUNT(*) FROM characters WHERE user_id = $1 AND is_new_character = true", uid).Scan(&numNewChars)
 	if err != nil {

server/signserver/session.go

@@ -97,7 +97,7 @@ func (s *Session) authenticate(username string, password string) {
 	switch resp {
 	case SIGN_SUCCESS:
 		if newCharaReq {
-			_ = s.server.newUserChara(username)
+			_ = s.server.newUserChara(uid)
 		}
 		bf.WriteBytes(s.makeSignResponse(uid))
 	default: