Fix merge conflict

03_data/README.md

@@ -54,7 +54,7 @@ immediately preceding wave because ongoing monitoring showed that many non-users
 remained non-users and that relatively few participants perceived AI as a social
 actor. To capture more contemporary usage and obtain sufficient variation for
 research questions filtering for individuals that perceived AI as a social
-actore, we broadened recruitment in wave 4 to all wave-1 participants. Sample 2
+actor, we broadened recruitment in wave 4 to all wave-1 participants. Sample 2
 therefore contains only participants with at least one missing wave.
 
 
@@ -107,7 +107,7 @@ some cleaning.
 
 * `trust_fav` and `Q161` and `Q162`
 * `obj_know` and `Q158`
-* intention labels sind vertauscht
+* the labels of the intention variables were swapped
   --> `int_use_bhvr_fav = int_use_bhvr_noUser` and vice versa
 * ...
 

README.md

@@ -35,8 +35,8 @@ factors connected to it.
 
 ## Contributors
 
-- Angelica Lermann Henestrosa, a.henestrosa@iwm-tuebingen.de
 - Anna Christina Faller, a.faller@iwm-tuebingen.de
+- Angelica Henestrosa, a.henestrosa@iwm-tuebingen.de
 - Büsra Sarigül, b.sariguel@iwm-tuebingen.de
 - Eva Nova Secco, e.secco@iwm-tuebingen.de
 - Gerrit Anders, g.anders@iwm-tuebingen.de
@@ -48,6 +48,7 @@ factors connected to it.
 - Stefanie Klein, s.klein@iwm-tuebingen.de
 - Teresa Luther, t.luther@iwm-tuebingen.de
 - Nora Wickelmaier, n.wickelmaier@iwm-tuebingen.de
+- Michael Steven Prentice
 
 
 ## Waves