added -f (force) option for branch.sh merge