game javascript
merge conflict