diff --git a/dbutils.py b/dbutils.py
index 541b4d3..32c788e 100644
--- a/dbutils.py
+++ b/dbutils.py
@@ -28,15 +28,11 @@ if __name__ == "__main__":
         default="00000000000000000000",
     )
     parser.add_argument("--message", "-m", type=str, help="Revision message")
-<<<<<<< Updated upstream
-    parser.add_argument("action", type=str, help="create, upgrade, downgrade, create-owner, migrate, create-revision, create-autorevision")
-=======
     parser.add_argument(
         "action",
         type=str,
-        help="create, upgrade, create-owner, migrate, create-revision",
+        help="create, upgrade, downgrade, create-owner, migrate, create-revision, create-autorevision",
     )
->>>>>>> Stashed changes
     args = parser.parse_args()
 
     cfg = CoreConfig()
diff --git a/titles/chuni/base.py b/titles/chuni/base.py
index 0224db0..8b1fb52 100644
--- a/titles/chuni/base.py
+++ b/titles/chuni/base.py
@@ -189,9 +189,11 @@ class ChuniBase:
                 {
                     "id": 1,
                     "type": 1,
-                    "message": f"Welcome to {self.core_cfg.server.name} network!"
-                    if not self.game_cfg.server.news_msg
-                    else self.game_cfg.server.news_msg,
+                    "message": (
+                        f"Welcome to {self.core_cfg.server.name} network!"
+                        if not self.game_cfg.server.news_msg
+                        else self.game_cfg.server.news_msg
+                    ),
                     "startDate": "2017-12-05 07:00:00.0",
                     "endDate": "2099-12-31 00:00:00.0",
                 }
@@ -982,18 +984,6 @@ class ChuniBase:
             for rp in upsert["userRecentPlayerList"]:
                 pass
 
-<<<<<<< Updated upstream
-        for rating_type in {"userRatingBaseList", "userRatingBaseHotList", "userRatingBaseNextList"}:
-            if rating_type not in upsert:
-                continue
-            
-            await self.data.profile.put_profile_rating(
-                user_id,
-                self.version,
-                rating_type,
-                upsert[rating_type],
-            )
-=======
         # added in LUMINOUS
         if "userCMissionList" in upsert:
             for cmission in upsert["userCMissionList"]:
@@ -1020,7 +1010,6 @@ class ChuniBase:
                 False if net_battle["isRankUpChallengeFailed"] == "false" else True
             )
             await self.data.profile.put_net_battle(user_id, net_battle)
->>>>>>> Stashed changes
 
         return {"returnCode": "1"}
 
diff --git a/titles/chuni/schema/profile.py b/titles/chuni/schema/profile.py
index 71691c2..9333a32 100644
--- a/titles/chuni/schema/profile.py
+++ b/titles/chuni/schema/profile.py
@@ -1,13 +1,4 @@
 from typing import Dict, List, Optional
-<<<<<<< Updated upstream
-from sqlalchemy import Table, Column, UniqueConstraint, and_
-from sqlalchemy.types import Integer, String, Boolean, JSON, BigInteger
-from sqlalchemy.schema import ForeignKey
-from sqlalchemy.engine import Row
-from sqlalchemy.sql import select, delete
-from sqlalchemy.dialects.mysql import insert
-=======
->>>>>>> Stashed changes
 
 from core.data.schema import BaseData, metadata
 from sqlalchemy import Column, Table, UniqueConstraint, and_
@@ -401,7 +392,6 @@ team = Table(
     mysql_charset="utf8mb4",
 )
 
-<<<<<<< Updated upstream
 rating = Table(
     "chuni_profile_rating",
     metadata,
@@ -418,8 +408,12 @@ rating = Table(
     Column("difficultId", Integer),
     Column("romVersionCode", Integer),
     Column("score", Integer),
-    UniqueConstraint("user", "version", "type", "index", name="chuni_profile_rating_best_uk"),
-=======
+    UniqueConstraint(
+        "user", "version", "type", "index", name="chuni_profile_rating_best_uk"
+    ),
+    mysql_charset="utf8mb4",
+)
+
 net_battle = Table(
     "chuni_profile_net_battle",
     metadata,
@@ -430,7 +424,6 @@ net_battle = Table(
     Column("battleIconId", Integer),
     Column("battleIconNum", Integer),
     Column("avatarEffectPoint", Integer),
->>>>>>> Stashed changes
     mysql_charset="utf8mb4",
 )
 
@@ -766,11 +759,8 @@ class ChuniProfileData(BaseData):
         total_play_count = 0
         for row in playcount_sql:
             total_play_count += row[0]
-<<<<<<< Updated upstream
-        return {
-            "total_play_count": total_play_count
-        }
-    
+        return {"total_play_count": total_play_count}
+
     async def put_profile_rating(
         self,
         aime_id: int,
@@ -792,9 +782,8 @@ class ChuniProfileData(BaseData):
                 f"put_profile_rating: Could not insert {rating_type}, aime_id: {aime_id}",
             )
             return
-        
-=======
-        return {"total_play_count": total_play_count}
+
+        return result.lastrowid
 
     async def get_net_battle(self, aime_id: int) -> Optional[Row]:
         sql = select(net_battle).where(net_battle.c.user == aime_id)
@@ -815,5 +804,4 @@ class ChuniProfileData(BaseData):
         result = await self.execute(conflict)
         if result is None:
             return None
->>>>>>> Stashed changes
         return result.lastrowid
diff --git a/titles/ongeki/schema/profile.py b/titles/ongeki/schema/profile.py
index 937fc72..6793c64 100644
--- a/titles/ongeki/schema/profile.py
+++ b/titles/ongeki/schema/profile.py
@@ -262,7 +262,9 @@ rating = Table(
     Column("difficultId", Integer),
     Column("romVersionCode", Integer),
     Column("score", Integer),
-    UniqueConstraint("user", "version", "type", "index", name="ongeki_profile_rating_best_uk"),
+    UniqueConstraint(
+        "user", "version", "type", "index", name="ongeki_profile_rating_best_uk"
+    ),
     mysql_charset="utf8mb4",
 )
 
@@ -550,8 +552,7 @@ class OngekiProfileData(BaseData):
             )
         else:
             return result.rowcount
-<<<<<<< Updated upstream
-    
+
     async def put_profile_rating(
         self,
         aime_id: int,
@@ -573,7 +574,5 @@ class OngekiProfileData(BaseData):
                 f"put_profile_rating_{rating_type}: Could not insert rating entries, aime_id: {aime_id}",
             )
             return
-        
+
         return result.lastrowid
-=======
->>>>>>> Stashed changes