A non utterly retarded neighbor generation method for boards
Fix merge conflicts