Fix merge conflict in git

git pull
git checkout source_branch
git pull origin master

Fix the conflict in files (ex. CHANGELOG.md):

vi CHANGELOG.md

Continue with commiting the changes:

git add CHANGELOG.md
git commit -m"fix conflict"
git push origin source_branch