How do you resolve merge conflicts in Git?

Merge conflicts occur when two branches modify the same part of a file differently. To

resolve:

Run the merge command:

git merge feature/contact-form