Fix merge errors

Author: usbalbin

Cargo.toml

@@ -140,8 +140,14 @@ incremental = false
 lto = true
 
 [[test]]
-name = "tests"
+name = "nucleo-g474"
 harness = false
+required-features = ["stm32g474", "defmt", "cordic"]
+
+[[test]]
+name = "nucleo-g474_w_jumpers"
+harness = false
+required-features = ["stm32g474", "defmt", "cordic"]
 
 [lib]
 test = false
@@ -162,16 +168,6 @@ required-features = ["usb"]
 name = "cordic"
 required-features = ["cordic"]
 
-[[test]]
-name = "nucleo-g474"
-harness = false
-required-features = ["stm32g474", "defmt", "cordic"]
-
-[[test]]
-name = "nucleo-g474_w_jumpers"
-harness = false
-required-features = ["stm32g474", "defmt", "cordic"]
-
 [[example]]
 name = "hrtim-adc-trigger"
 required-features = ["hrtim"]