Fix typo (alshedivat#1356)

_pages/about.md

@@ -24,6 +24,10 @@ social: true  # includes social icons at the bottom of the page
 
 I'm a third year PhD student in Biomedical Data Science at Stanford University and am fortunate to be advised by [Mike Baiocchi](https://profiles.stanford.edu/michael-baiocchi). 
 
+<<<<<<< HEAD
 I work on experimental design methodology for evaluating the causal effects of interventions that target behaviors and mindsets. I especially care about interventions in the health and healthcare spaces, including empowerment self-defense programs that equip women and girls with skills to resist sexual assault and machine learning-based clinical support tools that help physicians make better decisions for their patients.
+=======
+Put your address / P.O. box / other info right below your picture. You can also disable any of these elements by editing `profile` property of the YAML header of your `_pages/about.md`. Edit `_bibliography/papers.bib` and Jekyll will render your [publications page](/al-folio/publications/) automatically.
+>>>>>>> 2b725c1 (Fix typo (#1356))
 
 Previously, I received a B.S. in Biomedical Engineering and in Computer Science from Johns Hopkins University. I am grateful for several research mentors I had the privilege of working with prior to coming to Stanford: [Michael Miller](https://www.bme.jhu.edu/people/faculty/michael-i-miller/) at the [Johns Hopkins Center for Imaging Science](https://www.cis.jhu.edu/), [Sharon Hori](https://profiles.stanford.edu/sharon-hori?tab=bio) at the [Stanford Canary Center for Early Cancer Detection](https://canarycenter.stanford.edu/), and [Alain Trouvé](https://atrouve.perso.math.cnrs.fr/) at the [ENS Paris-Saclay Centre Borelli](https://centreborelli.ens-paris-saclay.fr/en).