When resolving a merge conflict on GitHub, you’ll now be warned before committing those changes into a default or protected branch.
Suggested Changes (public beta)
Collaborators can suggest code changes through inline comments in pull requests, and pull request authors can apply, reject, or edit these suggestions as an integrated part of the code review process.