Fix merge

diff --cc gram/simulation/simsoctb.v
index 4ca4b9d2982ce03a94965823f7b5168dd27225ad,efdf7f25974c360461694bbd25f0bf548b474a96..512a87410e7c7832bb6d50d597d96ab313305cd3
--- 1/gram/simulation/simsoctb.v
--- 2/gram/simulation/simsoctb.v
+++ b/gram/simulation/simsoctb.v
@@@ -1,6 -1,6 +1,6 @@@
  // This file is Copyright (c) 2020 LambdaConcept <contact@lambdaconcept.com>
  
--`timescale 1 ns / 100 ps
++`timescale 1 ns / 1 ns
  
  module simsoctb;
    //parameter simticks = 70000;