The game is finally workinggit add -A .git add -A .
merge conflicts