diff --git a/.gitignore b/.gitignore
index fea147b0e..963e1bfc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ public/source.tar*
 tmp/
 
 # Temporary files of every sort
+.byebug_history
 .sass-cache/
 .DS_Store
 .idea
diff --git a/Changelog.md b/Changelog.md
index e665abfb7..d69b4e5d4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 ## Refactor
 
 ## Bug fixes
+* Prefill conversation form on contacts page only with mutual contacts [#7744](https://github.com/diaspora/diaspora/pull/7744)
 
 ## Features