CODE EXAMPLE FOR SHELL

resolve merge conflict

git checkout develop
git merge --no-ff 'feature/imoh/issue#83_fingerprintRecognition'
git push origin develop