How to Resolve Conflicts in Pull Request | Git Branch Merge Conflict | Git Branch Merge vs Rebase