Update merge.sh, adding a check to ensure no local changes (staged or committed) exist prior to reverse-merge step