oops, looks like i have to pull master and rebase again. not to fret