diff --git a/src/systems/format.ts b/src/systems/format.ts
index 7205b43..fe5b6bb 100644
--- a/src/systems/format.ts
+++ b/src/systems/format.ts
@@ -92,7 +92,7 @@ function wrankDelta(entry: WRankEntry, options?: { brackets?: boolean }): string
     const numEmoji = getEmoji(`wrank_down_${delta}`);
     inner = (getEmoji("wrank_down") || "↓") + (numEmoji || delta);
   } else {
-    inner = (getEmoji("wrank_neutral") || "·") + "0";
+    inner = (getEmoji("wrank_no_dash") || "·") + (getEmoji("wrank_neutral_0") || "0");
   }
 
   return brackets ? ` (${inner})` : ` ${inner}`;
@@ -106,6 +106,16 @@ function wrankFull(entry: WRankEntry, options: WRankDisplayOptions): string {
   return wrankRank(entry, options.goal) + wrankDelta(entry, { brackets: options.brackets });
 }

 diff --git a/src/systems/poll.ts b/src/systems/poll.ts
index efab526..d6e1ca7 100644
--- a/src/systems/poll.ts
+++ b/src/systems/poll.ts
@@ -69,18 +69,45 @@ export function lockPoll(slot: number): void {
 
   persist.save(polls)
 }
- 

diff --git a/tsconfig.json b/tsconfig.json
index 4752ddc..d5f7ea7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,7 @@
     "paths": {
       "@src/*": ["src/*"],
       "@data/*": ["data/*"],
+      "@tests/*": ["tests/*"],
       "@messages/*": ["messages/*"],
       "@tgHistory/*": ["data/tg-history/*"],
       "@scripts/*": ["scripts/*"],


       diff --git a/messages/emojis.json b/messages/emojis.json
index c8c47d3..21e27e5 100644
--- a/messages/emojis.json
+++ b/messages/emojis.json
@@ -1,48 +1,4 @@
 {
-<<<<<<< HEAD
-  "capella": "<:Capella:1477082112560726238>",
-  "procyon": "<:Procyon:1477082175181426738>",
-  "bl": "<:bl:1510827912767475742>",
-  "fb": "<:fb:1510825907374395452>",
-  "fs": "<:fs:1510828058112954501>",
-  "fa": "<:fa:1510823955034935326>",
-  "fg": "<:fg:1510822372373037207>",
-  "gl": "<:gl:1510826513484873909>",
-  "dm": "<:dm:1510820686971670538>",
-  "wi": "<:wi:1510805237047230464>",
-  "wa": "<:wa:1510827932376109218>",
-  "wrank_up": "",
-  "wrank_down": "",
-  "atk": "",
-  "def": "",
-  "heal": "",
-  "wrank_neutral": "",
-  "wrank_1": "",
-  "wrank_1_gold": "",
-  "wrank_2": "",