diff --git a/src/nvim/testdir/test_lambda.vim b/src/nvim/testdir/test_lambda.vim
index 43483841ac..d51b6f7c5a 100644
--- a/src/nvim/testdir/test_lambda.vim
+++ b/src/nvim/testdir/test_lambda.vim
@@ -284,5 +284,3 @@ func Test_named_function_closure()
   call garbagecollect()
   call assert_equal(14, s:Abar())
 endfunc
-=======
->>>>>>> 381a8796... vim-patch:7.4.2044
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 70a70a6e83..815c401279 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -364,7 +364,7 @@ static int included_patches[] = {
   // 2079 NA
   // 2078 NA
   2077,
-  // 2076,
+  2076,
   2075,
   2074,
   // 2073 NA
diff --git a/test.vim b/test.vim
new file mode 100644
index 0000000000..f586b0042b
--- /dev/null
+++ b/test.vim
@@ -0,0 +1,7 @@
+  func! Afoo()
+    let x = 14
+    func! s:Abar()
+      return x
+    endfunc
+  endfunc
+  call Afoo()