CODE EXAMPLE FOR SHELL

CONFLICT (content): Merge conflict in

CONFLICT (content): Merge conflict in bash/alx

edit the changes manually 
git add *
git stash
git pull

git merge branh-name