Be different: conform.
Merge remote-tracking branch 'remotes/github/master'
Merge remote-tracking branch 'remotes/github/develop' into develop