modify for conflit
solve conflict
Merge branch 'master' of https://github.com/chaye146/RoleADice