Resolved conflicts and continued updating js for chessDB