BVO+:EASE24: Semi-automated merge conflict resolution

literature.bib

@@ -372,7 +372,23 @@ @mastersthesis{Guething23
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 2024 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
+@inproceedings{BVO+:EASE24,
+  author       = {Alexander Boll and
+                  Yael Van Dok and
+                  Manuel Ohrndorf and
+                  Alexander Schulthei{\ss} and
+                  Timo Kehrer},
+  title        = {Towards Semi-Automated Merge Conflict Resolution: Is It Easier Than
+                  We Expected?},
+  booktitle    = EASE,
+  pages        = {282--292},
+  publisher    = ACM,
+  address      = NY,
+  year         = 2024,
+  month        = June,
+  doi          = {10.1145/3661167.3661197},
+  location     = {Salerno, Italy}
+}
 
 @proceedings{MODEVAR24,
 	title = {{Sixth International Workshop on Languages for Modelling Variability (MODEVAR 2024)}},