diff --git a/.gitlab/merge_request_templates/Merge request.md b/.gitlab/merge_request_templates/Merge request.md
index a30b6856a..a31d214d5 100644
--- a/.gitlab/merge_request_templates/Merge request.md	
+++ b/.gitlab/merge_request_templates/Merge request.md	
@@ -1,3 +1,6 @@
+Please avoid merging the base branch into your feature branch. We are working with rebases and those merged tend to cause trouble. 
+For further questions, join us at Matrix: https://matrix.to/#/#funkwhale-dev:matrix.org
+
 Related issue: #XXX <!-- it's okay to have no issue for small changes -->
 
 This Merge Request includes: