Merge conflict resolved in .gitignore

1 job for 93-issue_try_jessica in 1 minute and 41 seconds