gitignore moved
single player
merge conflicts