diff --git a/libc-test/build.rs b/libc-test/build.rs
index d97285ca455ef..a0e183c048c96 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -1774,6 +1774,7 @@ fn test_freebsd(target: &str) {
                 "grp.h",
                 "iconv.h",
                 "ifaddrs.h",
+                "kvm.h",
                 "langinfo.h",
                 "libutil.h",
                 "limits.h",
diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs
index 0a7075adc1fba..c01a7edadbd84 100644
--- a/src/unix/bsd/freebsdlike/freebsd/mod.rs
+++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -33,19 +33,15 @@ pub type pthread_spinlock_t = *mut __c_anonymous_pthread_spinlock;
 pub type pthread_barrierattr_t = *mut __c_anonymous_pthread_barrierattr;
 pub type pthread_barrier_t = *mut __c_anonymous_pthread_barrier;
 
-<<<<<<< HEAD
 pub type uuid_t = ::uuid;
-=======
 pub type u_int = ::c_uint;
 pub type u_char = ::c_uchar;
 pub type u_long = ::c_ulong;
 pub type u_short = ::c_ushort;
 
-
 // It's an alias over "struct __kvm_t". However, its fields aren't supposed to be used directly,
 // making the type definition system dependent. Better not bind it exactly.
 pub type kvm_t = ::c_void;
->>>>>>> 08bfa53ee (Add more freebsd items)
 
 s! {
     pub struct aiocb {