Make sure conflicts don't show up on a new board

Fixes GH #7