Fix merge conflicts.

README.md

@@ -38,13 +38,8 @@ $ cargo add fd-lock
 ```
 
 ## Safety
-<<<<<<< HEAD
-This crate uses `unsafe` to interface with `libc` and `windows-sys`. All
+This crate uses `unsafe` on Windows to interface with `windows-sys`. All
 invariants have been carefully checked, and are manually enforced.
-=======
-This crate uses `unsafe` on Windows to interface with `winapi`. All invariants
-have been carefully checked, and are manually enforced.
->>>>>>> 96badb5 (Use rustix instead of calling libc directly.)
 
 ## Contributing
 Want to join us? Check out our ["Contributing" guide][contributing] and take a