Corrected merge conflict

diff --cc keyboards/atreus/keymaps/replicaJunction/keymap.c
index 79b2738aa32054f74fb04ff3cd374fcf35b8ee5b,7ff8933e897230230e54d2c9d852f044367b3f2f..992eabdbdbf422ed431bc2eaf8de575fa8eb4801
--- 1/keyboards/atreus/keymaps/replicaJunction/keymap.c
--- 2/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@@ -1,21 -1,7 +1,28 @@@
++<<<<<<< HEAD
 +#include "atreus.h"
 +
 +/*
 + * Keyboard: Atreus
 + * Keymap:   replicaJunction
 + * Version:  0.1
 + *
 + * This keymap is designed to complement my Ergodox keyboard layout, found in keyboards/ergodox_ez.
 + * The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox, and I now
 + * have both keyboards, so I've designed these layouts in an effort to make switching between the
 + * two as easy as possible.
 + *
 + * Clearly, the Atreus is the limiting factor in this equation, so I've taken heavy advantage of
 + * function and dual-role keys.
 + *
 + * The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found
 + * here: https://colemakmods.github.io/mod-dh/
 + */
++=======
+ // this is the style you want to emulate.
+ // This is the canonical layout file for the Quantum project. If you want to add another keyboard,
+ 
+ #include "atreus.h"
++>>>>>>> 32725dae5ba50f41bf16a80083727f08beaea7c6
  
  // Each layer gets a name for readability, which is then used in the keymap matrix below.
  // The underscores don't mean anything - you can have a layer called STUFF or any other name.