diff --git a/n/nano/nano-6.4-GCCcore-11.3.0.eb b/n/nano/nano-6.4-GCCcore-11.3.0.eb
index cbfc8cfb..d18c2355 100644
--- a/n/nano/nano-6.4-GCCcore-11.3.0.eb
+++ b/n/nano/nano-6.4-GCCcore-11.3.0.eb
@@ -17,7 +17,10 @@ sources = [SOURCE_TAR_GZ]
 checksums = ['85ebd9b4dba49839821d529bea16ac1acae0c9b9db2157531e40c9dffeb1b656']
 
 builddependencies = [('binutils', '2.38')]
+<<<<<<< HEAD:n/nano/nano-6.4-GCCcore-11.3.0.eb
+=======
 
+>>>>>>> 6c09b493988042e7963e7dd1bda6d4d088db2282:n/nano/nano-6.4.eb
 dependencies = [('ncurses', '6.3')]
 
 sanity_check_paths = {