Putting up my deck and gameboard versions
doing merge