yes

@@ -12,4 +12,7 @@ function b(){
 function c(){
     return console.log("wawa");
 >>>>>>> second
+}
+function g(){
+    return console.log("this is last line");
 }
\ No newline at end of file