board + passing values
fixed merge