Contradiction between Contributing doc and MR template

Summary

In the Contribution acceptance criteria point 5 is stating:

Your changes can merge without problems (if not please merge master, never rebase commits pushed to the remote server)

While in the MR template is stated:

Branch has no merge conflicts with master (if you do - rebase it please )

Expected behavior

The contributing documentation should be updated to state the same as the MR template