fix conflict
game dev notes