fixed readme.md
removed dependency on short flag for symbolic-ref
resolved readme merge conflict