GitHub repository: michael-wy-huang/demo-resolve-pr-conflict
Description: demo-resolve-pr-conflict-by-merge