fixing gitignore yet again
manual merge fix