Fix merge issue

verilog/rtl/user_defines.v

diff --git a/verilog/rtl/user_defines.v b/verilog/rtl/user_defines.v
index 6a586df..11169e0 100644
--- a/verilog/rtl/user_defines.v
+++ b/verilog/rtl/user_defines.v
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-FileCopyrightText: 2020 Efabless Corporation
-=======
 // SPDX-FileCopyrightText: 2022 Efabless Corporation
->>>>>>> remotes/efabless/main
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.