Automatically Check for Merge Conflicts

[lkiesow]

This patch adds a GitHub Actions workflow to automatically check for merge conflicts and mark pull requests as having conflicts.