game implementation
resolve merge conflicts