solved merge conflict

Author: simongravelle

.github/workflows/gh-pages.yml

@@ -3,7 +3,10 @@ name: Deploy GitHub Pages
 on:
   push:
     branches:
-      - 2Aug2023
+      - main
+  pull_request:
+    branches:
+      - main
 jobs:
   deploy:
     runs-on: ubuntu-20.04
@@ -42,7 +45,7 @@ jobs:
           cp source/gromacs_replace.html build/html/miscellaneous/use-gromacs-instead.html
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
-        if: ${{ github.ref == 'refs/heads/2Aug2023' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         with:
           context: .
           github_token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -15,6 +15,8 @@ repository named [lammpstutorials-inputs](https://github.com/lammpstutorials/lam
 
 The tutorials are compatible with the XXXX2024 release of LAMMPS.
 
+An article is currently is preparation and is [visible here](https://github.com/lammpstutorials/lammpstutorials-article).
+
 ## About LAMMPS tutorials
 
 The LAMMPStutorials website is made of seven tutorials that are ordered by increasing difficulty.

docs/sphinx/source/non-tutorials/cite.rst

@@ -0,0 +1,8 @@
+If you find these tutorials useful for your research or simulations, you can
+cite: A Set of Tutorials for the LAMMPS Simulation Package by Simon Gravelle,
+Jacob R. Gissinger, and Axel Kohlmeyer (2025) :cite:`gravelle2025tutorials`. You
+can access the full paper on |gravelle2025tutorials_arXiv|.
+
+.. |gravelle2025tutorials_arXiv| raw:: html
+
+    <a href="https://doi.org/10.48550/arXiv.2503.14020" target="_blank">arXiv</a>