fix conflict modified Piece::makePazzle