Updated gitignore; tried to fix collision