Merge 'develop' before for detect merge conflicts before merge master

PR is mergeable against master since the PR branch is the most recent version of master
Use PR head SHA instead merge commit

PRs SHA are present in the main repo history even without to be merged yet