conflicts with two simultaneous PRs

[tdhock]

First I created #11
then I merged #12 into master
then in the #11 branch I did

(base) tdhock@maude-MacBookPro:~/R/gallery(gh-pages)$ git pull upstream gh-pages
remote: Enumerating objects: 45, done.
remote: Counting objects: 100% (44/44), done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 31 (delta 17), reused 9 (delta 2), pack-reused 0
Unpacking objects: 100% (31/31), done.
From github.com:animint/gallery
 * branch            gh-pages   -> FETCH_HEAD
 * [new branch]      gh-pages   -> upstream/gh-pages
Auto-merging repos.txt
Auto-merging meta.csv
CONFLICT (content): Merge conflict in meta.csv
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Auto-merging error.csv
CONFLICT (content): Merge conflict in error.csv
Automatic merge failed; fix conflicts and then commit the result.

meta.csv had two different conflicting entries for below

2024-07-04T05:12:32.363866Z,tdhock/2024-07-04-HMM-angular-data,2024-07-04T05:08:41Z,https://github.com/tdhock/angular-change-paper/blob/main/figure-2d-hmm-real-interactive.R,Hidden Markov Model for 2d angular data

[tdhock]

current solution is to resolve conflict in meta.csv then re-run update_gallery()