10. Checkout master in case of conflicts

In case of following problems

fatal: Cannot do a soft reset in the middle of a merge.

error: you need to resolve your current index first

git reset --merge