Handle merge conflict.

Microsoft control characters fouled up the board.py.