Build failure fix.

Author: Mason Ray Hanna III

tests/ui/path_join_correction.rs

@@ -5,6 +5,9 @@
 #![warn(clippy::path_join_correction)]
 use std::path::Path;
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 0b2f18b2c (Build failure fix.)
 
 fn main() {
     // should be linted