deleted some stuff
conflicts
gitignore