diff --git a/README.md b/README.md
index aef6cc1..821f3f7 100755
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Detail: [client-readme](https://github.com/wzdwc/TexasPokerGame/tree/master/clie
 ```
 ## Demo
 See: [demo](http://www.jojgame.com)
-![img](https://github.com/wzdwc/TexasPokerGame/blob/master/gif/qrcode.jpg)
+![img](https://github.com/wzdwc/TexasPokerGame/blob/master/gif/qr.jpg)
 
 ![img](https://github.com/wzdwc/TexasPokerGame/blob/master/gif/demo1.gif)
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..034e848
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.
diff --git a/gif/qr.jpg b/gif/qr.jpg
new file mode 100644
index 0000000..4089e25
Binary files /dev/null and b/gif/qr.jpg differ
diff --git a/gif/qrCode.jpg b/gif/qrCode.jpg
deleted file mode 100644
index 99d77ee..0000000
Binary files a/gif/qrCode.jpg and /dev/null differ
diff --git a/server/src/app/core/PokerGame.ts b/server/src/app/core/PokerGame.ts
index 64878d0..c639170 100644
--- a/server/src/app/core/PokerGame.ts
+++ b/server/src/app/core/PokerGame.ts
@@ -432,7 +432,11 @@ export class PokerGame {
     if (this.playerSize === 1
       && (this.currActionAllinPlayer.length === 0
         || (command === ECommand.ALL_IN
+<<<<<<< HEAD
           && this.prevSize <= nextPlayer.actionSize
+=======
+          && this.currPlayer.node.actionSize < nextPlayer.actionSize
+>>>>>>> 36eadbe76514757b8d5a5d3ebfff5cb1c7cb87e0
           && this.currPlayer.node.actionSize < this.prevSize))) {
       return true;
     }