diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7c9618cc1..b73b5f6ca 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -243,6 +243,7 @@ Lee Doughty <32392044+leedoughty@users.noreply.github.com>
 memchr <memchr@proton.me>
 Max Romanowski <maxr777@proton.me>
 Aldlss <ayaldlss@gmail.com>
+<<<<<<< HEAD
 Hanna Nilsén <hanni614@student.liu.se>
 Elias Johansson Lara <elias.johanssonlara@gmail.com>
 Toby Penner <tobypenner01@gmail.com>
@@ -251,6 +252,7 @@ Matbe766 <matildabergstrom01@gmail.com
 
 >>>>>>> fcd53376f (qt: normalize large progress totals to kilobytes to avoid QProgressBar overflow (#4341); docs: update CONTRIBUTORS)
 
+
 ********************
 
 The text of the 3 clause BSD license follows: