diff --git a/nucleus/device_test.go b/nucleus/device_test.go
index d3d2ae9831eda694f938c2c0485dacadd6d9367d..2a99663663c3d1416eac8328df54348113d8940e 100644
--- a/nucleus/device_test.go
+++ b/nucleus/device_test.go
@@ -52,7 +52,11 @@ func TestNewDevice(t *testing.T) {
 	sbi := &OpenConfig{}
 	type args struct {
 		sbi  SouthboundInterface
+<<<<<<< HEAD
 		opts *tpb.TransportOption
+=======
+		opts TransportOptions
+>>>>>>> develop
 		name string
 	}
 	tests := []struct {