Raise Octokit::Conflict for 409 errors

Adds a new exception that can track merge conflict errors.