Heads up @[username], we just merged some commits (latest: [commit]) that conflict with the changes your made in this pull request! You can review this repository's [recent commits](https://github.com/[repoOwner]/[repoName]/commits/master) to see where the conflicts occur. Please rebase your feature branch against the `upstream/master` branch and [resolve](http://zulip.readthedocs.io/en/latest/git-guide.html#recover-from-a-git-rebase-failure) your pull request's merge conflicts accordingly.

Heads up @[username], we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's [recent commits](https://github.com/[repoOwner]/[repoName]/commits/master) to see where the conflicts occur. Please rebase your feature branch against the `upstream/master` branch and [resolve](http://zulip.readthedocs.io/en/latest/git-guide.html#recover-from-a-git-rebase-failure) your pull request's merge conflicts accordingly.

Modify merge conflict warning message.
templates: Modify merge conflict warning message.

