Resolved merge conflict in .gitignore

in 11 minutes and 15 seconds, using 0 compute credits, and was queued for 1 second
latest