Remove some merge conflicts
Merge pull request #9 from ktn/BoardStrikesBack

Remove some merge conflicts