gitignore adjusts
Removed because generate conficts