diff --git a/Bender.lock b/Bender.lock
index d5c4adda..27c7c07f 100644
--- a/Bender.lock
+++ b/Bender.lock
@@ -145,13 +145,8 @@ packages:
     - register_interface
     - tech_cells_generic
   register_interface:
-<<<<<<< HEAD
     revision: d7693be4aef1fc7e7eb2b00b41c42e87d959866c
     version: 0.4.2
-=======
-    revision: ed8c85111db11b8c4b9e37e4f792908e01cea2ba
-    version: null
->>>>>>> 43fe908... Bender.yml: Rollback
     source:
       Git: https://github.com/pulp-platform/register_interface.git
     dependencies:
diff --git a/hw/cheshire_ext_playground.sv b/hw/cheshire_ext_playground.sv
index ab4758d0..98c3a101 100644
--- a/hw/cheshire_ext_playground.sv
+++ b/hw/cheshire_ext_playground.sv
@@ -273,5 +273,5 @@ module cheshire_ext_playground
 //    end
 //  end
   end
- 
+
 endmodule
diff --git a/hw/cheshire_ext_playground_pkg.sv b/hw/cheshire_ext_playground_pkg.sv
index d0f37e9f..e6339f33 100644
--- a/hw/cheshire_ext_playground_pkg.sv
+++ b/hw/cheshire_ext_playground_pkg.sv
@@ -16,11 +16,12 @@ package cheshire_ext_playground_pkg;
   // Number of slave peripherals
   localparam int unsigned ChsPlaygndNumPeriphs = 1;
 
-  // Number of slave mems  
+  // Number of slave mems
   localparam int unsigned ChsPlaygndNumAxiMems = 3;
-    
+
   // Total number of master and slaves
-  localparam int unsigned ChsPlaygndNumSlvDevices = ChsPlaygndNumDsaDma + ChsPlaygndNumPeriphs + ChsPlaygndNumAxiMems;
+  localparam int unsigned ChsPlaygndNumSlvDevices = ChsPlaygndNumDsaDma +
+                                                    ChsPlaygndNumPeriphs + ChsPlaygndNumAxiMems;
   localparam int unsigned ChsPlaygndNumMstDevices = ChsPlaygndNumDsaDma;
 
   // Narrow AXI widths
@@ -79,9 +80,12 @@ package cheshire_ext_playground_pkg;
     ret.AxiExtNumSlv      = 5; // For the playground, traffic DMA(s) (config port), system timer
     ret.AxiExtNumRules    = 5;
     // External AXI region map
-    ret.AxiExtRegionIdx   = '{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, MemCoreReadSlvIdx, MemDmaReadSlvIdx, MemWriteSlvIdx, Dsa0SlvIdx, PeriphsSlvIdx };
-    ret.AxiExtRegionStart = '{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, MemCoreReadBase,   MemDmaReadBase,   MemWriteBase,   Dsa0Base,   PeriphsBase   };
-    ret.AxiExtRegionEnd   = '{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, MemCoreReadEnd,    MemDmaReadEnd,    MemWriteEnd,    Dsa0End,    PeriphsEnd    };
+    ret.AxiExtRegionIdx   = '{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, MemCoreReadSlvIdx,
+                              MemDmaReadSlvIdx, MemWriteSlvIdx, Dsa0SlvIdx, PeriphsSlvIdx };
+    ret.AxiExtRegionStart = '{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, MemCoreReadBase,
+                              MemDmaReadBase,   MemWriteBase,   Dsa0Base,   PeriphsBase   };
+    ret.AxiExtRegionEnd   = '{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, MemCoreReadEnd,
+                              MemDmaReadEnd,    MemWriteEnd,    Dsa0End,    PeriphsEnd    };
     ret.BusErr            = 0;
     return ret;
   endfunction
diff --git a/sw/tests/2d_dma.c b/sw/tests/2d_dma.c
index bf84fda1..6e96be60 100755
--- a/sw/tests/2d_dma.c
+++ b/sw/tests/2d_dma.c
@@ -1,3 +1,11 @@
+// Copyright 2023 ETH Zurich and University of Bologna.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Thomas Benz <tbenz@iis.ee.ethz.ch>
+//
+// Playground binary
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <printf.h>
@@ -6,7 +14,7 @@
 #include "axirt.h"
 #include "regs/axi_rt.h"
 
-int main(void){
+int main(void) {
 
     // Size of transfer
     volatile uint64_t size_bytes = 256;
diff --git a/target/sim/vsim/chs_axi_rt_gen_wave.tcl b/target/sim/vsim/chs_axi_rt_gen_wave.tcl
index cad5a16d..e0b70626 100644
--- a/target/sim/vsim/chs_axi_rt_gen_wave.tcl
+++ b/target/sim/vsim/chs_axi_rt_gen_wave.tcl
@@ -1,3 +1,9 @@
+# Copyright 2022 ETH Zurich and University of Bologna.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Thomas Benz <tbenz@iis.ee.ethz.ch>
+
 onerror {resume}
 quietly WaveActivateNextPane {} 0
 set RT_LOC "/tb_cheshire_soc/fix/dut/gen_axi_rt/i_axi_rt_unit_top"
diff --git a/target/sim/vsim/run_pg.tcl b/target/sim/vsim/run_pg.tcl
index 73e3fbb6..9017c2da 100644
--- a/target/sim/vsim/run_pg.tcl
+++ b/target/sim/vsim/run_pg.tcl
@@ -1,3 +1,9 @@
+# Copyright 2022 ETH Zurich and University of Bologna.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Thomas Benz <tbenz@iis.ee.ethz.ch>
+
 source compile.cheshire_soc.tcl
 set BOOTMODE 0
 set PRELMODE 0