{subsubsection: Reviewers of Jira tickets shall}
 
 *: Only accept changes via pull request
+*: Verify that (GitHub thinks) the merge is clean.  If it isn't, and you're confident you can resolve the conflicts, do so.  Otherwise, send it back to the original developer.
 *: Verify that the jira ticket has a target version number and that it is correct
 *: Verify that the jira ticket is in review status
 *: review the pull request and approve (or disapprove)