Created by: gauthamlal
Fixed grammatical errors in '\additional-material\git_workflow_scenarios\resolving-merge-conflicts.md'
Created by: gauthamlal
Fixed grammatical errors in '\additional-material\git_workflow_scenarios\resolving-merge-conflicts.md'