diff --git a/go.sum b/go.sum
index 1430b6f6..0e74685d 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,7 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
+<<<<<<< Updated upstream
 shylinux.com/x/golang-story v0.2.2 h1:BtkjQFskjgvYEj9+YE0cvcxbkEcw66zlCfgvGUxt4+I=
 shylinux.com/x/golang-story v0.2.2/go.mod h1:WSbe0YIjFjYqeEQxUbbkVVc2pGM4KbGLNkmD/SYBjiY=
 shylinux.com/x/ice v0.3.4/go.mod h1:dkM+AclnlcNjkOX0log/poCfR9nbWg6POZHEk41QYxo=
@@ -23,3 +24,5 @@ shylinux.com/x/redis-story v0.2.4/go.mod h1:Av1Et/AYq7ol/iFCKN7Zc6DoCSMvIa/F08Nz
 shylinux.com/x/toolkits v0.3.8/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA=
 shylinux.com/x/toolkits v0.3.9 h1:apRA1BljrzFCBcesOpeIWYWsoC0JN6tgVO8TM+wUrg8=
 shylinux.com/x/toolkits v0.3.9/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA=
+=======
+>>>>>>> Stashed changes