Resolve conflict in .gitignore

3 jobs for 23-fix-versioning-and-create-prepare-publishing in 3 minutes and 58 seconds (queued for 1 second)