diff --git a/clippy_lints/src/functions.rs b/clippy_lints/src/functions.rs
index 0da7e26a1be..5b4f6f2ad17 100644
--- a/clippy_lints/src/functions.rs
+++ b/clippy_lints/src/functions.rs
@@ -90,7 +90,10 @@ pub struct Functions {
 
 impl Functions {
     pub fn new(threshold: u64, max_lines: u64) -> Self {
-        Self { threshold, max_lines }
+        Self {
+            threshold,
+            max_lines
+        }
     }
 }
 
diff --git a/tests/ui/functions_maxlines.rs b/tests/ui/functions_maxlines.rs
index ada35abde99..56fcd4866d6 100644
--- a/tests/ui/functions_maxlines.rs
+++ b/tests/ui/functions_maxlines.rs
@@ -1,5 +1,6 @@
 #![warn(clippy::too_many_lines)]
 
+
 fn good_lines() {
     /* println!("This is good."); */
     // println!("This is good.");
@@ -106,6 +107,7 @@ fn bad_lines() {
     println!("This is bad.");
     println!("This is bad.");
     println!("This is bad.");
+<<<<<<< HEAD
     println!("This is bad.");
     println!("This is bad.");
     println!("This is bad.");